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

Posted by Mark Brown 1 year, 6 months ago

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

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

Posted by Greg KH 1 year, 6 months ago

On Mon, Jun 17, 2024 at 08:52:45PM +0100, Mark Brown wrote:
> 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,.*":

Looks good, thanks!