[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <ZnCUDSypSIPCTfJ8@sirena.org.uk>
Date: Mon, 17 Jun 2024 20:52:45 +0100
From: Mark Brown <broonie@...nel.org>
To: Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>
Cc: Bjorn Andersson <andersson@...nel.org>,
Gustavo Silva <gustavograzs@...il.com>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>,
Sumit Garg <sumit.garg@...aro.org>
Subject: linux-next: manual merge of the char-misc tree with the qcom tree
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,.*":
Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)
Powered by blists - more mailing lists