From: Stephen Warren <swarren@wwwdotorg.org>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
Kevin Hilman <khilman@linaro.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
Markus Mayer <markus.mayer@linaro.org>,
Rob Herring <robh@kernel.org>
Subject: Re: linux-next: manual merge of the bcm2835 tree with the arm-soc tree
Date: Sun, 02 Mar 2014 22:21:02 -0700 [thread overview]
Message-ID: <5314113E.1030106@wwwdotorg.org> (raw)
In-Reply-To: <20140303120241.11066f951d53c50fb14faf47@canb.auug.org.au>
On 03/02/2014 06:02 PM, Stephen Rothwell wrote:
> Hi Stephen,
>
> Today's linux-next merge of the bcm2835 tree got a conflict in
> arch/arm/mach-bcm2835/Kconfig between commits ddb902cc3459 ("ARM:
> centralize common multi-platform kconfig options") and
> 0676b21fffd1 ("ARM: bcm2835: enable V6K instead of plain V6") from
> the arm-soc tree and commit d30fe6272183 ("ARM: bcm2835: Move to
> mach-bcm directory") from the bcm2835 tree.
Olof, Arnd, Kevin,
Do you want me to rebase the patch that moves
arch/arm/mach-bcm2835/Kconfig into arch/arm/mach-bcm/Kconfig, or even
drop it and take it through arm-soc directly? Or, will you just handle
this when you merge the pull request?
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: Sun, 02 Mar 2014 22:21:02 -0700 [thread overview]
Message-ID: <5314113E.1030106@wwwdotorg.org> (raw)
In-Reply-To: <20140303120241.11066f951d53c50fb14faf47@canb.auug.org.au>
On 03/02/2014 06:02 PM, Stephen Rothwell wrote:
> Hi Stephen,
>
> Today's linux-next merge of the bcm2835 tree got a conflict in
> arch/arm/mach-bcm2835/Kconfig between commits ddb902cc3459 ("ARM:
> centralize common multi-platform kconfig options") and
> 0676b21fffd1 ("ARM: bcm2835: enable V6K instead of plain V6") from
> the arm-soc tree and commit d30fe6272183 ("ARM: bcm2835: Move to
> mach-bcm directory") from the bcm2835 tree.
Olof, Arnd, Kevin,
Do you want me to rebase the patch that moves
arch/arm/mach-bcm2835/Kconfig into arch/arm/mach-bcm/Kconfig, or even
drop it and take it through arm-soc directly? Or, will you just handle
this when you merge the pull request?
next prev parent reply other threads:[~2014-03-03 5:21 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-03 1:02 linux-next: manual merge of the bcm2835 tree with the arm-soc tree Stephen Rothwell
2014-03-03 1:02 ` Stephen Rothwell
2014-03-03 1:02 ` Stephen Rothwell
2014-03-03 5:21 ` Stephen Warren [this message]
2014-03-03 5:21 ` Stephen Warren
2014-03-03 5:35 ` Olof Johansson
2014-03-03 5:35 ` Olof Johansson
-- strict thread matches above, loose matches on Subject: below --
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
2014-03-09 12:14 Mark Brown
2013-03-18 4:06 Stephen Rothwell
2013-03-18 4:06 ` Stephen Rothwell
2013-03-18 4:06 ` Stephen Rothwell
2013-03-18 4:04 Stephen Rothwell
2013-03-18 4:04 ` Stephen Rothwell
2013-03-18 4:04 ` Stephen Rothwell
2013-03-18 15:19 ` Stephen Warren
2013-03-18 15:19 ` Stephen Warren
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=5314113E.1030106@wwwdotorg.org \
--to=swarren@wwwdotorg.org \
--cc=arnd@arndb.de \
--cc=khilman@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=markus.mayer@linaro.org \
--cc=olof@lixom.net \
--cc=robh@kernel.org \
--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.