From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753366Ab2IYHQ6 (ORCPT ); Tue, 25 Sep 2012 03:16:58 -0400 Received: from 115-188-14-127.jetstream.xtra.co.nz ([115.188.14.127]:49434 "EHLO SERVER.prisktech.co.nz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751768Ab2IYHQ5 (ORCPT ); Tue, 25 Sep 2012 03:16:57 -0400 From: Tony Prisk To: "sfr@canb.auug.org.au" CC: "olof@lixom.net" , "arnd@arndb.de" , "linux-arm-kernel@lists.infradead.org" , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "greg@kroah.com" Subject: Re: linux-next: manual merge of the arm-soc tree with the tree Thread-Topic: linux-next: manual merge of the arm-soc tree with the tree Thread-Index: AQHNmu1f94zuhjlY906I1XK8ZlSVMA== Date: Tue, 25 Sep 2012 07:14:15 +0000 Message-ID: <1348557420.18425.0.camel@gitbox> References: <20120925163724.703a41b9438fbaef84b7480e@canb.auug.org.au> In-Reply-To: <20120925163724.703a41b9438fbaef84b7480e@canb.auug.org.au> Accept-Language: en-GB, en-NZ, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id q8P7H3js024818 On Tue, 2012-09-25 at 16:37 +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > Documentation/devicetree/bindings/usb/platform-uhci.txt between commit > 100d45970327 ("ARM: vt8500: Add support for UHCI companion controller") > from the usb tree and commit 95e9fd10f06c ("arm: vt8500: doc: Add device > tree bindings for arch-vt8500 devices") from the arm-soc tree. > > I used the version from the arm-soc tree and can carry the fix as > necessary (no action is required). > Both versions were the same (my bad for not removing it from the arm-soc patch). Thanks Stephen Regards Tony P {.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I