From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758376AbbLBNvm (ORCPT ); Wed, 2 Dec 2015 08:51:42 -0500 Received: from down.free-electrons.com ([37.187.137.238]:39593 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758276AbbLBNvl convert rfc822-to-8bit (ORCPT ); Wed, 2 Dec 2015 08:51:41 -0500 From: Gregory CLEMENT To: Arnd Bergmann Cc: Mark Brown , Jason Cooper , andrew@lunn.ch, linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the mvebu tree with the arm-soc tree References: <20151202111244.b7ee49ee06b4a95e407e740d@kernel.org> <20151202111829.GE1929@sirena.org.uk> <2428665.BrOON4cELy@wuerfel> Date: Wed, 02 Dec 2015 14:49:52 +0100 In-Reply-To: <2428665.BrOON4cELy@wuerfel> (Arnd Bergmann's message of "Wed, 02 Dec 2015 12:21:21 +0100") Message-ID: <87bna92c5b.fsf@free-electrons.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Arnd, On mer., déc. 02 2015, Arnd Bergmann wrote: > On Wednesday 02 December 2015 11:18:29 Mark Brown wrote: >> On Wed, Dec 02, 2015 at 11:12:44AM +0000, Mark Brown wrote: >> > Hi all, >> > >> > Today's linux-next merge of the mvebu tree got a conflict in between commit >> > 377524dc4d77f50e ("ARM: mmp: move into ARCH_MULTIPLATFORM") from the arm-soc >> > tree and commit 5f4423af9dd17 ("ARM: orion: multiplatform support") from the >> > mvebu tree. >> >> Ccing in Arnd since I forgot to do that. >> > > I was planning to merge all the multiplatform changes into one next/multiplatform > branch, but the mvebu maintainers preferred to keep this one in their > tree at Indeed except the arch/arm/Kconfig file all the other files belong to the mbebu subsystem and it is easier to to keep in our tree to handle them. > least initially. The conflict will go away once it's tested sufficiently and > I'm pulling it back. By the way, when you will pull our tree, we will still have it our own mvebu/for-next branch. Will git managed to automagically resolve the conflict by getting the resolution you will do in your branch? A another solution could be to have a separate patch for the arch/arm/Kconfig file that you keep in arm-soc. Grégory -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com