From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Shawn Guo <shawn.guo@linaro•org>
Cc: "Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Robert Yang" <decatf@gmail•com>,
"Jonathan Cameron" <Jonathan.Cameron@huawei•com>,
"Jonathan Neuschäfer" <j.neuschaefer@gmx•net>
Subject: linux-next: manual merge of the staging tree with the imx-mxs tree
Date: Fri, 12 Apr 2019 14:49:21 +1000 [thread overview]
Message-ID: <20190412144921.3a152478@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1355 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
Documentation/devicetree/bindings/vendor-prefixes.txt
between commit:
189733b0a7e4 ("dt-bindings: Add vendor prefix for Rakuten Kobo, Inc.")
from the imx-mxs tree and commit:
2e5cee6c7622 ("dt-bindings: Add vendor prefix for Kionix, Inc.")
from the staging 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 5f2b185a04e6,93753f447c20..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -211,7 -210,7 +211,8 @@@ kiebackpeter Kieback & Peter Gmb
kinetic Kinetic Technologies
kingdisplay King & Display Technology Co., Ltd.
kingnovel Kingnovel Technology Co., Ltd.
+ kionix Kionix, Inc.
+kobo Rakuten Kobo Inc.
koe Kaohsiung Opto-Electronics Inc.
kosagi Sutajio Ko-Usagi PTE Ltd.
kyo Kyocera Corporation
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-04-12 4:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-12 4:49 Stephen Rothwell [this message]
2019-05-08 3:47 ` linux-next: manual merge of the staging tree with the imx-mxs tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2014-02-25 6:09 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=20190412144921.3a152478@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Jonathan.Cameron@huawei$(echo .)com \
--cc=decatf@gmail$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=j.neuschaefer@gmx$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--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