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: "Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Clément Péron" <peron.clem@gmail.com>,
"Maxime Ripard" <maxime.ripard@bootlin.com>,
"Jeff LaBundy" <jeff@labundy.com>
Subject: linux-next: manual merge of the input tree with the arm-soc tree
Date: Wed, 1 May 2019 13:40:54 +1000 [thread overview]
Message-ID: <20190501134054.4271616e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1319 bytes --]
Hi Dmitry,
Today's linux-next merge of the input tree got a conflict in:
Documentation/devicetree/bindings/vendor-prefixes.txt
between commit:
2c98d9e47533 ("dt-bindings: vendor-prefixes: add AZW")
from the arm-soc tree and commit:
7b5bb55d0dad ("Input: add support for Azoteq IQS550/572/525")
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.txt
index 5f2b185a04e6,51f99549161e..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -54,7 -53,7 +54,8 @@@ avic Shanghai AVIC Optoelectronics Co.
avnet Avnet, Inc.
axentia Axentia Technologies AB
axis Axis Communications AB
+ azoteq Azoteq (Pty) Ltd
+azw Shenzhen AZW Technology Co., Ltd.
bananapi BIPAI KEJI LIMITED
bhf Beckhoff Automation GmbH & Co. KG
bitmain Bitmain Technologies
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-05-01 3:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-01 3:40 Stephen Rothwell [this message]
2019-05-12 23:28 ` linux-next: manual merge of the input tree with the arm-soc tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-01-11 23:39 Stephen Rothwell
2023-02-21 22:10 ` Stephen Rothwell
2020-10-06 5:06 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=20190501134054.4271616e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=dmitry.torokhov@gmail.com \
--cc=jeff@labundy.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maxime.ripard@bootlin.com \
--cc=olof@lixom.net \
--cc=peron.clem@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;
as well as URLs for NNTP newsgroup(s).