From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robherring2@gmail.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andrew Lunn <andrew@lunn.ch>, Jun Nie <jun.nie@linaro.org>,
Kevin Hilman <khilman@linaro.org>
Subject: linux-next: manual merge of the dt-rh tree with the arm-soc tree
Date: Wed, 24 Jun 2015 13:31:33 +1000 [thread overview]
Message-ID: <20150624133133.435a979d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 949 bytes --]
Hi Rob,
Today's linux-next merge of the dt-rh tree got a conflict in:
Documentation/devicetree/bindings/vendor-prefixes.txt
between commit:
d5553cb05a04 ("ARM: dts: zx: add an initial zx296702 dts and doc")
from the arm-soc tree and commit:
72d942e23cda ("of: Add vendor prefix for Zodiac Inflight Innovations")
from the dt-rh tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index a0aa80bb3480,c400c95abc67..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -225,4 -211,4 +225,5 @@@ xillybus Xillybus Ltd
xlnx Xilinx
zyxel ZyXEL Communications Corp.
zarlink Zarlink Semiconductor
+ zii Zodiac Inflight Innovations
+zte ZTE Corp.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-06-24 3:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-24 3:31 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-05-22 7:10 Stephen Rothwell
2014-01-17 3:23 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=20150624133133.435a979d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=andrew@lunn.ch \
--cc=arnd@arndb.de \
--cc=jun.nie@linaro.org \
--cc=khilman@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--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
all inboxes | Powered by JetHome®