From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757948AbbLBLWB (ORCPT ); Wed, 2 Dec 2015 06:22:01 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:62471 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757923AbbLBLV7 (ORCPT ); Wed, 2 Dec 2015 06:21:59 -0500 From: Arnd Bergmann To: Mark Brown Cc: Jason Cooper , andrew@lunn.ch, gregory.clement@free-electrons.com, 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 12:21:21 +0100 Message-ID: <2428665.BrOON4cELy@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <20151202111829.GE1929@sirena.org.uk> References: <20151202111244.b7ee49ee06b4a95e407e740d@kernel.org> <20151202111829.GE1929@sirena.org.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:rnx51dSwZDX3/hIH7zMRzcjpKHMXyJxpdtXehcCLT9kg8itw89o eCMhdgmjT2z4+Q8etPWhiOsY1Gqdw+CsHbX/DeGncC74xlto/2JL/+ZHN7g60HbCwRJPqFX w8KKJ1Oz4Cq1dBbWMCeAaWpKAljC+iBLh5cqUKLXIfsbnZi8DbXky615yyHB1ggDqomY44v Mkx9xoMZVDKK+ov9S8+pw== X-UI-Out-Filterresults: notjunk:1;V01:K0:FL1yVcL1bKI=:ZWOoTwuabtb0yFIiwNIZWs yeQk3kt0P21YjEA4Na4Rf1OtMkETtPhsBLNpywSZMAakbcnYb/qZEJfsF+Wo54zUdDXoGUJVn kc0QvSJZwYyajMHioCJwU2mmq6cN/qYuyxR5Wei1KTvN6Y5e4xyH1AQXxOq0tOIw35f1FOrWl o1A3tpB3aczmBEFMmJ/Wn0cDMIEyQthM7tjDe7D+eBO5rAAYDsjmG0OqqDE0AGO3rNVqAYJZl quhDkGjwNC7/LjL7sVFlLGWmrNsFhx1cshCewRpWYb4hBJlbUupFlnkjTNffzuYGnyoi4b4ZS ap7ErMHfwwPta0XFjyCUzJD2wvLPaKhR4VZ45x+rxmzABIj4KxrpIYjGd1ANx1eiZreiCFYU/ KIhxpY/g6sWmX7PC0Z5u4K5V8IgpVdeUpbqi2ZfQ1j59ek+1Fv6cWKEz7dYZjvj65rGRf3nVo OGsHy6BqtTuyIn3KBXk0r4nd9oKoRb/FXoKizQeaaZPEzCNdqD46/8N1wPyV3X8xcRafQw7DE yggWKDenGg9+7ZF3zMW1mEh85nEV3ehQBwLGroTUYiN9j2/f1P7zqFNllweSlnoFctdeU4fHy 1/LxjCS4c1o+WFQZ+r9Ktk3MuWhIwtV+q+iGhI34GZXn6UorC+JTaB8CKdtvJYxpJYo+c4x8b 7SZy2k2SXCkMLwD+OaUl9etcPQpNMALAcyRoa7DBtHMZQFa3lZYCdlHo4zx2OfKaczTThOC5x N+BTub+NWpSfozXl Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 least initially. The conflict will go away once it's tested sufficiently and I'm pulling it back. Arnd From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Wed, 02 Dec 2015 12:21:21 +0100 Subject: linux-next: manual merge of the mvebu tree with the arm-soc tree In-Reply-To: <20151202111829.GE1929@sirena.org.uk> References: <20151202111244.b7ee49ee06b4a95e407e740d@kernel.org> <20151202111829.GE1929@sirena.org.uk> Message-ID: <2428665.BrOON4cELy@wuerfel> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 least initially. The conflict will go away once it's tested sufficiently and I'm pulling it back. Arnd