From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rob Herring <robh@kernel•org>, Mark Brown <broonie@kernel•org>,
Liam Girdwood <lgirdwood@gmail•com>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Nick Li <nick.li@foursemi•com>
Subject: linux-next: manual merge of the devicetree tree with the sound-asoc tree
Date: Wed, 27 Aug 2025 11:48:41 +1000 [thread overview]
Message-ID: <20250827114841.6df8a5f4@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1447 bytes --]
Hi all,
Today's linux-next merge of the devicetree tree got a conflict in:
Documentation/devicetree/bindings/vendor-prefixes.yaml
between commit:
243167e96939 ("dt-bindings: vendor-prefixes: Add Shanghai FourSemi Semiconductor Co.,Ltd")
from the sound-asoc tree and commit:
77a03a290243 ("dt-bindings: vendor-prefixes: Add undocumented vendor prefixes")
from the devicetree 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 58f3b07f4254,0f5273123650..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -556,8 -568,8 +572,10 @@@ patternProperties
description: FocalTech Systems Co.,Ltd
"^forlinx,.*":
description: Baoding Forlinx Embedded Technology Co., Ltd.
+ "^foursemi,.*":
+ description: Shanghai FourSemi Semiconductor Co.,Ltd.
+ "^foxlink,.*":
+ description: Foxlink Group
"^freebox,.*":
description: Freebox SAS
"^freecom,.*":
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 484 bytes --]
next reply other threads:[~2025-08-27 1:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-27 1:48 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-03-31 1:47 linux-next: manual merge of the devicetree tree with the sound-asoc tree Stephen Rothwell
2023-03-28 23:32 Stephen Rothwell
2017-06-14 2:54 Stephen Rothwell
2017-06-14 13:55 ` Rob Herring
2017-06-14 14:30 ` Mark Brown
2017-06-14 20:52 ` Sakari Ailus
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=20250827114841.6df8a5f4@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=broonie@kernel$(echo .)org \
--cc=lgirdwood@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nick.li@foursemi$(echo .)com \
--cc=robh@kernel$(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