Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751643AbdFIDxI (ORCPT ); Thu, 8 Jun 2017 23:53:08 -0400 Received: from ozlabs.org ([103.22.144.67]:35715 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751622AbdFIDxG (ORCPT ); Thu, 8 Jun 2017 23:53:06 -0400 Date: Fri, 9 Jun 2017 13:53:04 +1000 From: Stephen Rothwell To: Rob Herring , Simon Horman Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Marcus Cooper , Biju Das Subject: linux-next: manual merge of the devicetree tree with the renesas tree Message-ID: <20170609135304.6c1108aa@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1301 Lines: 40 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. -- 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