linux-kernel - linux-next: manual merge of the devicetree tree with the sound-asoc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20250827114841.6df8a5f4@canb.auug.org.au>
Date: Wed, 27 Aug 2025 11:48:41 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Rob Herring <robh@...nel.org>, Mark Brown <broonie@...nel.org>, Liam
 Girdwood <lgirdwood@...il.com>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Nick Li <nick.li@...rsemi.com>
Subject: linux-next: manual merge of the devicetree tree with the sound-asoc
 tree

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,.*":

Content of type "application/pgp-signature" skipped