From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>
Cc: Heiko Stuebner <heiko@sntech.de>,
Johan Jonker <jbx6244@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Michael Srba <Michael.Srba@seznam.cz>
Subject: linux-next: manual merge of the input tree with the arm-soc tree
Date: Tue, 6 Oct 2020 16:06:22 +1100 [thread overview]
Message-ID: <20201006160622.601d8c28@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1409 bytes --]
Hi all,
Today's linux-next merge of the input tree got a conflict in:
Documentation/devicetree/bindings/vendor-prefixes.yaml
between commit:
cb1cc137a2c1 ("dt-bindings: Add vendor prefix for Shenzhen Zkmagic Technology Co., Ltd.")
from the arm-soc tree and commit:
8f445ffa851e ("dt-bindings: input/touchscreen: add bindings for zinitix")
from the input 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.yaml
index 6242f1baa24c,bd7b2d404124..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -1214,8 -1143,8 +1214,10 @@@ patternProperties
description: Shenzhen Zidoo Technology Co., Ltd.
"^zii,.*":
description: Zodiac Inflight Innovations
+ "^zinitix,.*":
+ description: Zinitix Co., Ltd
+ "^zkmagic,.*":
+ description: Shenzhen Zkmagic Technology Co., Ltd.
"^zte,.*":
description: ZTE Corp.
"^zyxel,.*":
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-10-06 5:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-06 5:06 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-11 23:39 linux-next: manual merge of the input tree with the arm-soc tree Stephen Rothwell
2023-02-21 22:10 ` Stephen Rothwell
2019-05-01 3:40 Stephen Rothwell
2019-05-12 23:28 ` Stephen Rothwell
2012-01-03 3:33 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=20201006160622.601d8c28@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Michael.Srba@seznam.cz \
--cc=arnd@arndb.de \
--cc=dmitry.torokhov@gmail.com \
--cc=heiko@sntech.de \
--cc=jbx6244@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
/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;
as well as URLs for NNTP newsgroup(s).