linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Salter <msalter@redhat.com>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: Will Deacon <will.deacon@arm.com>,
	Russell King <rmk+kernel@arm.linux.org.uk>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the c6x tree
Date: Fri, 25 Oct 2013 09:22:57 -0400	[thread overview]
Message-ID: <1382707377.1768.89.camel@deneb.redhat.com> (raw)
In-Reply-To: <1382706224-8859-1-git-send-email-treding@nvidia.com>

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

  parent reply	other threads:[~2013-10-25 13:23 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-24 16:31 linux-next: Tree for Oct 24 Thierry Reding
2013-10-24 20:02 ` linux-next: Tree for Oct 24 (xilinx_uartps) Randy Dunlap
2013-10-25  5:02 ` linux-next: Tree for Oct 24 Guenter Roeck
2013-10-25  8:35   ` Thierry Reding
2013-10-25 13:16     ` Olof Johansson
2013-10-25 13:24       ` Mark Brown
2013-10-25 13:33         ` Olof Johansson
2013-10-25 15:45           ` Mark Brown
2013-10-25 13:35       ` Thierry Reding
2013-10-25 13:43         ` Olof Johansson
2013-10-25 14:17           ` Thierry Reding
2013-10-25 15:02             ` Guenter Roeck
2013-10-25 15:17               ` Thierry Reding
2013-10-25 17:17                 ` Guenter Roeck
2013-10-25 18:04                   ` Geert Uytterhoeven
2013-10-25 13:03 ` linux-next: manual merge of the c6x tree Thierry Reding
2013-10-25 13:03   ` linux-next: manual merge of the h8300-remove tree Thierry Reding
2013-10-25 13:35     ` Mark Salter
2013-10-25 15:09     ` Guenter Roeck
2013-10-25 13:03   ` linux-next: manual merge of the mfd-lj tree Thierry Reding
2013-10-25 13:03   ` linux-next: manual merge of the tip tree Thierry Reding
2013-10-25 13:25     ` Will Deacon
2013-10-26  8:40       ` Ingo Molnar
2013-10-26 14:01         ` Will Deacon
2013-10-27  7:12           ` Ingo Molnar
2013-10-27 10:00             ` Russell King - ARM Linux
2013-10-28  7:47               ` Thierry Reding
2013-10-28  8:45                 ` Russell King - ARM Linux
2013-10-25 13:03   ` linux-next: manual merge of the kvm-arm tree Thierry Reding
2013-10-25 13:07     ` Marc Zyngier
2013-10-25 13:03   ` linux-next: manual merge of the imx-mxs tree Thierry Reding
2013-10-25 13:22   ` Mark Salter [this message]
2013-10-25 13:36     ` linux-next: manual merge of the c6x tree Thierry Reding
2013-10-26 13:19   ` Russell King - ARM Linux
2013-10-28  7:34     ` Thierry Reding

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1382707377.1768.89.camel@deneb.redhat.com \
    --to=msalter@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rmk+kernel@arm.linux.org.uk \
    --cc=thierry.reding@gmail.com \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).