All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Warren <swarren@wwwdotorg.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org
Subject: Re: linux-next: manual merge of the bcm2835 tree with the arm-soc tree
Date: Mon, 18 Mar 2013 09:19:29 -0600	[thread overview]
Message-ID: <51473081.2040607@wwwdotorg.org> (raw)
In-Reply-To: <20130318150415.7a9db62e8cfe03623a411ae9@canb.auug.org.au>

On 03/17/2013 10:04 PM, Stephen Rothwell wrote:
> Hi Stephen,
> 
> Today's linux-next merge of the bcm2835 tree got a conflict in 
> arch/arm/Kconfig between commit 15bc1fe67f66 ("ARM: cns3xxx:
> enable multiplatform support") from the arm-soc tree and commit
> f1ac922dec7e ("ARM: bcm2835: convert to multi-platform") from the
> bcm2835 tree.

Thanks. The resolution for the two bcm2835/arm-soc conflicts looks
fine. These conflicts should go away once I send bcm2835 pull requests
to arm-soc for inclusion in 3.10.

WARNING: multiple messages have this Message-ID (diff)
From: swarren@wwwdotorg.org (Stephen Warren)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the bcm2835 tree with the arm-soc tree
Date: Mon, 18 Mar 2013 09:19:29 -0600	[thread overview]
Message-ID: <51473081.2040607@wwwdotorg.org> (raw)
In-Reply-To: <20130318150415.7a9db62e8cfe03623a411ae9@canb.auug.org.au>

On 03/17/2013 10:04 PM, Stephen Rothwell wrote:
> Hi Stephen,
> 
> Today's linux-next merge of the bcm2835 tree got a conflict in 
> arch/arm/Kconfig between commit 15bc1fe67f66 ("ARM: cns3xxx:
> enable multiplatform support") from the arm-soc tree and commit
> f1ac922dec7e ("ARM: bcm2835: convert to multi-platform") from the
> bcm2835 tree.

Thanks. The resolution for the two bcm2835/arm-soc conflicts looks
fine. These conflicts should go away once I send bcm2835 pull requests
to arm-soc for inclusion in 3.10.

  reply	other threads:[~2013-03-18 15:19 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-18  4:04 linux-next: manual merge of the bcm2835 tree with the arm-soc tree Stephen Rothwell
2013-03-18  4:04 ` Stephen Rothwell
2013-03-18  4:04 ` Stephen Rothwell
2013-03-18 15:19 ` Stephen Warren [this message]
2013-03-18 15:19   ` Stephen Warren
  -- strict thread matches above, loose matches on Subject: below --
2013-03-18  4:06 Stephen Rothwell
2013-03-18  4:06 ` Stephen Rothwell
2013-03-18  4:06 ` Stephen Rothwell
2014-03-03  1:02 Stephen Rothwell
2014-03-03  1:02 ` Stephen Rothwell
2014-03-03  1:02 ` Stephen Rothwell
2014-03-03  5:21 ` Stephen Warren
2014-03-03  5:21   ` Stephen Warren
2014-03-03  5:35   ` Olof Johansson
2014-03-03  5:35     ` Olof Johansson
2014-03-09 12:14 Mark Brown
2014-12-08  1:06 Stephen Rothwell
2014-12-08  1:06 ` Stephen Rothwell
2014-12-08  1:06 ` Stephen Rothwell
2014-12-08 11:25 ` Arnd Bergmann
2014-12-08 11:25   ` Arnd Bergmann
2014-12-08 13:00   ` Lee Jones
2014-12-08 13:00     ` Lee Jones
2014-12-08 13:28     ` Arnd Bergmann
2014-12-08 13:28       ` Arnd Bergmann
2014-12-08 13:49       ` Lee Jones
2014-12-08 13:49         ` Lee Jones
2014-12-08 15:08         ` Arnd Bergmann
2014-12-08 15:08           ` Arnd Bergmann
2014-12-08 16:08         ` Stephen Warren
2014-12-08 16:08           ` Stephen Warren
2014-12-08 16:51           ` Lee Jones
2014-12-08 16:51             ` Lee Jones
2014-12-08 17:37             ` Stephen Warren
2014-12-08 17:37               ` Stephen Warren
2014-12-09  8:21               ` Lee Jones
2014-12-09  8:21                 ` Lee Jones

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=51473081.2040607@wwwdotorg.org \
    --to=swarren@wwwdotorg.org \
    --cc=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=sfr@canb.auug.org.au \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.