From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Salter Subject: Re: linux-next: manual merge of the c6x tree Date: Fri, 25 Oct 2013 09:22:57 -0400 Message-ID: <1382707377.1768.89.camel@deneb.redhat.com> References: <1382632289-18523-1-git-send-email-treding@nvidia.com> <1382706224-8859-1-git-send-email-treding@nvidia.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.redhat.com ([209.132.183.28]:44414 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753815Ab3JYNXT (ORCPT ); Fri, 25 Oct 2013 09:23:19 -0400 In-Reply-To: <1382706224-8859-1-git-send-email-treding@nvidia.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Thierry Reding Cc: Will Deacon , Russell King , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org On Fri, 2013-10-25 at 15:03 +0200, Thierry Reding wrote: > Today's linux-next merge of the c6x tree got a conflict in > > arch/arm/Kconfig > > caused by commits 148104c (ARM: 7854/1: lockref: add support for lockless > lockrefs using cmpxchg64) and commit d701884 (arm: select > ARCH_MIGHT_HAVE_PC_PARPORT). > > I fixed it up (see below). Please verify that the resolution looks good. > Thanks, > Thierry > --- > diff --cc arch/arm/Kconfig > index c06647d,7db8abe0..b6a708e > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@@ -5,7 -5,7 +5,8 @@@ config AR > select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE > select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST > select ARCH_HAVE_CUSTOM_GPIO_H > + select ARCH_USE_CMPXCHG_LOCKREF > + select ARCH_MIGHT_HAVE_PC_PARPORT > select ARCH_WANT_IPC_PARSE_VERSION > select BUILDTIME_EXTABLE_SORT if MMU > select CLONE_BACKWARDS ARCH_USE_CMPXCHG_LOCKREF needs to come after ARCH_MIGHT_HAVE_PC_PARPORT to keep things sorted alphabetically. Other than that, its fine. --Mark