[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20131028073446.GB6629@ulmo.nvidia.com>
Date: Mon, 28 Oct 2013 08:34:46 +0100
From: Thierry Reding <thierry.reding@...il.com>
To: Russell King - ARM Linux <linux@....linux.org.uk>
Cc: Will Deacon <will.deacon@....com>,
Mark Salter <msalter@...hat.com>, linux-next@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the c6x tree
On Sat, Oct 26, 2013 at 02:19:38PM +0100, Russell King - ARM Linux wrote:
> On Fri, Oct 25, 2013 at 03:03:39PM +0200, Thierry Reding wrote:
> > 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
>
> Thanks. Generally we want these things to be arranged alphabetically to
> reduce the longer term chances of hitting merge conflicts, but in this
> case it wouldn't make any difference.
I was aiming for alphabetical order... guess I need to revisit my ABCs.
Thierry
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists