From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robherring2@gmail.com>, Simon Horman <horms@verge.net.au>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Marcus Cooper <codekipper@gmail.com>,
Biju Das <biju.das@bp.renesas.com>
Subject: linux-next: manual merge of the devicetree tree with the renesas tree
Date: Fri, 9 Jun 2017 13:53:04 +1000 [thread overview]
Message-ID: <20170609135304.6c1108aa@canb.auug.org.au> (raw)
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
next reply other threads:[~2017-06-09 3:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-09 3:53 Stephen Rothwell [this message]
2017-06-09 13:46 ` linux-next: manual merge of the devicetree tree with the renesas tree Rob Herring
2017-06-12 9:58 ` Simon Horman
2017-06-09 16:01 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170609135304.6c1108aa@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=biju.das@bp.renesas.com \
--cc=codekipper@gmail.com \
--cc=horms@verge.net.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robherring2@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).