From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751756AbdFIQBo (ORCPT ); Fri, 9 Jun 2017 12:01:44 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:51653 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751562AbdFIQBm (ORCPT ); Fri, 9 Jun 2017 12:01:42 -0400 Date: Fri, 9 Jun 2017 18:01:38 +0200 From: Simon Horman To: Stephen Rothwell Cc: Rob Herring , Linux-Next Mailing List , Linux Kernel Mailing List , Marcus Cooper , Biju Das Subject: Re: linux-next: manual merge of the devicetree tree with the renesas tree Message-ID: <20170609160136.GA15359@verge.net.au> References: <20170609135304.6c1108aa@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170609135304.6c1108aa@canb.auug.org.au> Organisation: Horms Solutions BV User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jun 09, 2017 at 01:53:04PM +1000, Stephen Rothwell wrote: > Hi Rob, > > Today's linux-next merge of the devicetree tree got a conflict in: > > Documentation/devicetree/bindings/vendor-prefixes.txt > > between commit: > > d795f15618b8 ("of: Add vendor prefix for iWave Systems Technologies Pvt. Ltd") > > from the renesas tree and commit: > > 97a0268e764c ("devicetree: add Itead vendor prefix") > > from the devicetree tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. Thanks Stephen, the merge looks correct to me. Rob, would you prefer if this patch was not merged through my renesas tree? > > -- > Cheers, > Stephen Rothwell > > diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt > index b946fc4b172a,b81092afe76d..000000000000 > --- a/Documentation/devicetree/bindings/vendor-prefixes.txt > +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt > @@@ -158,7 -159,7 +159,8 @@@ iom Iomega Corporatio > isee ISEE 2007 S.L. > isil Intersil > issi Integrated Silicon Solutions Inc. > + itead ITEAD Intelligent Systems Co.Ltd > +iwave iWave Systems Technologies Pvt. Ltd. > jdi Japan Display Inc. > jedec JEDEC Solid State Technology Association > karo Ka-Ro electronics GmbH >