lkml.org 
[lkml]   [2013]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the c6x tree
From
Date
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



\
 
 \ /
  Last update: 2013-10-25 16:01    [W:0.158 / U:1.384 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site