From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Warren Subject: Re: linux-next: manual merge of the bcm2835 tree with the arm-soc tree Date: Sun, 02 Mar 2014 22:21:02 -0700 Message-ID: <5314113E.1030106@wwwdotorg.org> References: <20140303120241.11066f951d53c50fb14faf47@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from avon.wwwdotorg.org ([70.85.31.133]:59705 "EHLO avon.wwwdotorg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750800AbaCCFVG (ORCPT ); Mon, 3 Mar 2014 00:21:06 -0500 In-Reply-To: <20140303120241.11066f951d53c50fb14faf47@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Olof Johansson , Arnd Bergmann , Kevin Hilman Cc: Stephen Rothwell , linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Markus Mayer , Rob Herring 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?