Re: linux-next: manual merge of the c6x tree

2013-10-28 Thread Thierry Reding
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 >

Re: linux-next: manual merge of the c6x tree

2013-10-26 Thread Russell King - ARM Linux
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

Re: linux-next: manual merge of the c6x tree

2013-10-25 Thread Thierry Reding
On Fri, Oct 25, 2013 at 09:22:57AM -0400, Mark Salter wrote: > 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 > >

Re: linux-next: manual merge of the c6x tree

2013-10-25 Thread Mark Salter
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_H

linux-next: manual merge of the c6x tree

2013-10-25 Thread Thierry Reding
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 r