From mboxrd@z Thu Jan  1 00:00:00 1970
From: swarren@wwwdotorg.org (Stephen Warren)
Date: Sun, 02 Mar 2014 22:21:02 -0700
Subject: linux-next: manual merge of the bcm2835 tree with the arm-soc tree
In-Reply-To: <20140303120241.11066f951d53c50fb14faf47@canb.auug.org.au>
References: <20140303120241.11066f951d53c50fb14faf47@canb.auug.org.au>
Message-ID: <5314113E.1030106@wwwdotorg.org>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

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?