From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rob Herring <robherring2@gmail•com>, Shawn Guo <shawn.guo@linaro•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Andrej Rosano <andrej@inversepath•com>,
Rask Ingemann Lambertsen <ccc94453@vip•cybercity.dk>
Subject: linux-next: manual merge of the devicetree tree with the imx-mxs tree
Date: Fri, 9 Sep 2016 13:10:01 +1000 [thread overview]
Message-ID: <20160909131001.024a5b50@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:
8266b4ae7135 ("devicetree: Add vendor prefix for Inverse Path")
from the imx-mxs tree and commit:
a24f7253f26d ("devicetree: Sort vendor prefixes in alphabetical order")
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 cc15e9911dc8,4d95a9ddecdf..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -136,7 -134,7 +135,8 @@@ innolux Innolux Corporatio
intel Intel Corporation
intercontrol Inter Control Group
invensense InvenSense Inc.
+inversepath Inverse Path
+ iom Iomega Corporation
isee ISEE 2007 S.L.
isil Intersil
issi Integrated Silicon Solutions Inc.
next reply other threads:[~2016-09-09 3:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-09 3:10 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-06-29 3:47 linux-next: manual merge of the devicetree tree with the imx-mxs tree Stephen Rothwell
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=20160909131001.024a5b50@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andrej@inversepath$(echo .)com \
--cc=ccc94453@vip$(echo .)cybercity.dk \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robherring2@gmail$(echo .)com \
--cc=shawn.guo@linaro$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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