From: Mark Brown <broonie@kernel.org>
To: Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>
Cc: Bjorn Andersson <andersson@kernel.org>,
Gustavo Silva <gustavograzs@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Sumit Garg <sumit.garg@linaro.org>
Subject: linux-next: manual merge of the char-misc tree with the qcom tree
Date: Mon, 17 Jun 2024 20:52:45 +0100 [thread overview]
Message-ID: <ZnCUDSypSIPCTfJ8@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1325 bytes --]
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
Documentation/devicetree/bindings/vendor-prefixes.yaml
between commit:
1fabbb0888c3d ("dt-bindings: vendor-prefixes: Add Schneider Electric")
from the qcom tree and commit:
202ce3eaa6912 ("dt-bindings: vendor-prefixes: add ScioSense")
from the char-misc 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.
diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
index 56ad56d7733e9,044e2001f4e3a..0000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -1264,8 -1254,8 +1264,10 @@@ patternProperties
description: Smart Battery System
"^schindler,.*":
description: Schindler
+ "^schneider,.*":
+ description: Schneider Electric
+ "^sciosense,.*":
+ description: ScioSense B.V.
"^seagate,.*":
description: Seagate Technology PLC
"^seeed,.*":
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-06-17 19:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-17 19:52 Mark Brown [this message]
2024-06-18 6:38 ` linux-next: manual merge of the char-misc tree with the qcom tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2019-01-29 3:08 Stephen Rothwell
2019-01-29 11:46 ` Georgi Djakov
2019-01-29 20:30 ` Andy Gross
2019-01-29 21:07 ` Greg KH
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=ZnCUDSypSIPCTfJ8@sirena.org.uk \
--to=broonie@kernel.org \
--cc=andersson@kernel.org \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=gustavograzs@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sumit.garg@linaro.org \
/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).