From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753243AbdKMWw2 (ORCPT ); Mon, 13 Nov 2017 17:52:28 -0500 Received: from ozlabs.org ([103.22.144.67]:51301 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753200AbdKMWwY (ORCPT ); Mon, 13 Nov 2017 17:52:24 -0500 Date: Tue, 14 Nov 2017 09:52:21 +1100 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Catalin Marinas Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Stephen Boyd , Will Deacon Subject: Re: linux-next: manual merge of the tip tree with the arm64 tree Message-ID: <20171114095221.0b443af1@canb.auug.org.au> In-Reply-To: <20171101164718.66c27003@canb.auug.org.au> References: <20171101164718.66c27003@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, On Wed, 1 Nov 2017 16:47:18 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > arch/arm64/Kconfig > > between commit: > > 396a5d4a5c32 ("arm64: Unconditionally support {ARCH_}HAVE_NMI{_SAFE_CMPXCHG}") > > from the arm64 tree and commit: > > 087133ac9076 ("locking/qrwlock, arm64: Move rwlock implementation over to qrwlocks") > > from the tip tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > -- > Cheers, > Stephen Rothwell > > diff --cc arch/arm64/Kconfig > index 38f8d26208af,6205f521b648..000000000000 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@@ -21,8 -21,25 +21,25 @@@ config ARM6 > select ARCH_HAS_STRICT_KERNEL_RWX > select ARCH_HAS_STRICT_MODULE_RWX > select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST > - select ARCH_HAVE_NMI_SAFE_CMPXCHG if ACPI_APEI_SEA > + select ARCH_HAVE_NMI_SAFE_CMPXCHG > + select ARCH_INLINE_READ_LOCK if !PREEMPT > + select ARCH_INLINE_READ_LOCK_BH if !PREEMPT > + select ARCH_INLINE_READ_LOCK_IRQ if !PREEMPT > + select ARCH_INLINE_READ_LOCK_IRQSAVE if !PREEMPT > + select ARCH_INLINE_READ_UNLOCK if !PREEMPT > + select ARCH_INLINE_READ_UNLOCK_BH if !PREEMPT > + select ARCH_INLINE_READ_UNLOCK_IRQ if !PREEMPT > + select ARCH_INLINE_READ_UNLOCK_IRQRESTORE if !PREEMPT > + select ARCH_INLINE_WRITE_LOCK if !PREEMPT > + select ARCH_INLINE_WRITE_LOCK_BH if !PREEMPT > + select ARCH_INLINE_WRITE_LOCK_IRQ if !PREEMPT > + select ARCH_INLINE_WRITE_LOCK_IRQSAVE if !PREEMPT > + select ARCH_INLINE_WRITE_UNLOCK if !PREEMPT > + select ARCH_INLINE_WRITE_UNLOCK_BH if !PREEMPT > + select ARCH_INLINE_WRITE_UNLOCK_IRQ if !PREEMPT > + select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE if !PREEMPT > select ARCH_USE_CMPXCHG_LOCKREF > + select ARCH_USE_QUEUED_RWLOCKS > select ARCH_SUPPORTS_MEMORY_FAILURE > select ARCH_SUPPORTS_ATOMIC_RMW > select ARCH_SUPPORTS_NUMA_BALANCING Just a reminder that this conflict still exists (but is now between the arm64 and Linus' trees - since part of the tip tree has been merged). -- Cheers, Stephen Rothwell