From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758638AbbLBPKE (ORCPT ); Wed, 2 Dec 2015 10:10:04 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:59300 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753447AbbLBPKB (ORCPT ); Wed, 2 Dec 2015 10:10:01 -0500 From: Arnd Bergmann To: Gregory CLEMENT 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 Date: Wed, 02 Dec 2015 16:09:22 +0100 Message-ID: <241533090.9LSHZ5gDBE@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <87bna92c5b.fsf@free-electrons.com> References: <20151202111244.b7ee49ee06b4a95e407e740d@kernel.org> <2428665.BrOON4cELy@wuerfel> <87bna92c5b.fsf@free-electrons.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:T83ypAKg4zHaTdt6dOfP+ZgPBvs3Y/EtehFoKfCXfKgC49Hu0Le AwOu2HhSe9RgMA3dNVG4LtRcJ8MLjPHwYWH+Y+udwTCWCI851babyqDN0Bv54QHT99Ew+Hm Wuz0xv8rNfwz1vRdoB8Z4HkaJtUvsAJ1cEZjrzHSrk3Aa5vGyCO1DojhEILOhlMXFtOgzDf wmSa8msGzoUAACA38a0XQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:vDQjYzEtF2U=:VgXj+yeoJGeyRjrTBr8JNc 7PyMKfLYhkPDbwedsCLqWppmlmorHOrHBkcLIwRd0ZiVL0unH1BygKXMtUauAK2qMX69kW2qm 48Vg0ipy843nDHWTHqGbwCIZ9qGzZ58BBufLKEjOi+1VjOPZsf/RbTAlNXmySsVelKo4g9E/p r4C2NMEjZ9LTb8pc/5hfLtf76ybhqd5NG+bIxG1CjvvEEupp2Y1C0h+AX95p9cy2iajIOYa3c aUdmNDwQ7GzdjpcCbLwE1Zlk/zYqNRarngAptvAvlcKHPC953cOgu/gv7aETD/tXJPHs1rJPy 6z9UMHB0NPgENmpm2U5Ik6CvubCk0b6FMwrN3WvXSJjb/6Qw0fML+Zn6DicTylZtjdmE+WLRC 8ncLqsSJgxE0nziK7JAMmJRriqr2TWwOxvIrmidp2g/0ix4PUeack0W3h19WmUn3/h3RpNHsB iTlYBTD5mAtZUqqm2HQRA4/kcjIbo4HHGEovJmfqzg4doGuUIp0b0EM9q4dc7T1bw/ghHFQwE YVU5RYKI2DfrR9Y9NBkMYJH2XYRBSsjR2QiJ8jKTCJuO3clQqNXtXatmAeteusBXsxjQi6024 /l3jT2zmRoXDaGs3ReeWLjqIIczeTTOozxAJvnbnmPPJwZ8Kb5OoP1dYp+mtyHcwOnG19Im1/ LDXh5TA33OFuH3+OmK21OQO8/ZIwAW799/HweF+jLjwgD7BUK8WobPNSgN+du6bpm9pT6BXg9 6JlY50rVj5AN7JuU Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wednesday 02 December 2015 14:49:52 Gregory CLEMENT wrote: > > > 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? Yes, that should be fine, unless you resolve the same conflict differently. > A another solution could be to have a separate patch for the > arch/arm/Kconfig file that you keep in arm-soc. No, I don't think that will be necessary. Arnd From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Wed, 02 Dec 2015 16:09:22 +0100 Subject: linux-next: manual merge of the mvebu tree with the arm-soc tree In-Reply-To: <87bna92c5b.fsf@free-electrons.com> References: <20151202111244.b7ee49ee06b4a95e407e740d@kernel.org> <2428665.BrOON4cELy@wuerfel> <87bna92c5b.fsf@free-electrons.com> Message-ID: <241533090.9LSHZ5gDBE@wuerfel> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wednesday 02 December 2015 14:49:52 Gregory CLEMENT wrote: > > > 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? Yes, that should be fine, unless you resolve the same conflict differently. > A another solution could be to have a separate patch for the > arch/arm/Kconfig file that you keep in arm-soc. No, I don't think that will be necessary. Arnd