From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dave Airlie <airlied@linux•ie>, Shawn Guo <shawn.guo@linaro•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Sean Cross <xobs@kosagi•com>,
Lucas Stach <l.stach@pengutronix•de>,
Thierry Reding <treding@nvidia•com>
Subject: linux-next: manual merge of the drm tree with the imx-mxs tree
Date: Tue, 22 Dec 2015 11:45:02 +1100 [thread overview]
Message-ID: <20151222114502.6adbfdd9@canb.auug.org.au> (raw)
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.
reply other threads:[~2015-12-22 0:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20151222114502.6adbfdd9@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=l.stach@pengutronix$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=shawn.guo@linaro$(echo .)org \
--cc=treding@nvidia$(echo .)com \
--cc=xobs@kosagi$(echo .)com \
/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