* linux-next: manual merge of the drm tree with the imx-mxs tree
@ 2015-12-22 0:45 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-12-22 0:45 UTC (permalink / raw)
To: Dave Airlie, Shawn Guo
Cc: linux-next, linux-kernel, Sean Cross, Lucas Stach, Thierry Reding
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
Documentation/devicetree/bindings/vendor-prefixes.txt
between commit:
453bb38ce504 ("devicetree: bindings: Add vendor prefix for Kosagi")
from the imx-mxs tree and commit:
f42fb5539ab5 ("devicetree: add vendor prefix for Kyocera Corporation")
from the drm 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 e4cd78a4c652,b123731b2dca..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -123,7 -124,7 +124,8 @@@ jedec JEDEC Solid State Technology Asso
karo Ka-Ro electronics GmbH
keymile Keymile GmbH
kinetic Kinetic Technologies
+kosagi Sutajio Ko-Usagi PTE Ltd.
+ kyo Kyocera Corporation
lacie LaCie
lantiq Lantiq Semiconductor
lenovo Lenovo Group Ltd.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-12-22 0:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-22 0:45 linux-next: manual merge of the drm tree with the imx-mxs tree Stephen Rothwell
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).