Skip to contentSkip to conversation

linux-next: manual merge of the char-misc tree with the qcom tree

PATCH Mark Brown 2 participants 2 messages Jun 17, 2024 – Jun 18, 2024

Subsystems (2)
Device tree bindings Linux-next tree
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

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.

Documentation/devicetree/bindings/vendor-prefixes.yaml +0 -0
diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
index 56ad56d7733e9,044e2001f4e3a..0000000000000
@@@ -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,.*":
#1 lore raw
Quoted 28 lines · Mark Brown

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.

Documentation/devicetree/bindings/vendor-prefixes.yaml +0 -0
diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
index 56ad56d7733e9,044e2001f4e3a..0000000000000

Documentation/devicetree/bindings/vendor-prefixes.yaml

Quoted 10 lines
Documentation/devicetree/bindings/vendor-prefixes.yaml +2 -0
@@@ -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,.*":

Looks good, thanks!