linux-next: manual merge of the devicetree tree with the mfd tree

linux-next: manual merge of the devicetree tree with the mfd tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 919 bytes --]

Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

Today's linux-next merge of the devicetree tree got a conflict in:

  Documentation/devicetree/bindings/arm/samsung/sysreg.yaml

between commit:

  18394297562a ("dt-bindings: mfd: syscon: Merge Samsung Exynos Sysreg bindings")

from the mfd tree and commit:

  41fb845621ea ("dt-bindings: Another round of adding missing 'additionalProperties'")

from the devicetree tree.

I fixed it up (I just deleted the file) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the devicetree tree with the mfd tree

[Rob Herring]

On Tue, Mar 22, 2022 at 2:18 AM Lee Jones <lee.jones@linaro.org> wrote:
>
> On Tue, 22 Mar 2022, Stephen Rothwell wrote:
>
> > Hi all,
> >
> > Today's linux-next merge of the devicetree tree got a conflict in:
> >
> >   Documentation/devicetree/bindings/mfd/syscon.yaml
> >
> > between commit:
> >
> >   844dd8fe02f2 ("dt-bindings: Add compatibles for undocumented trivial syscons")
> >
> > from the mfd tree and commit:
> >
> >   c1ff0c0f24d6 ("dt-bindings: mfd: syscon: add microchip,lan966x-cpu-syscon compatible")
> >
> > from the devicetree tree.
>
> Did you accidentally hoover this up Rob?

I'll drop it.

Rob

Re: linux-next: manual merge of the devicetree tree with the mfd tree

[Lee Jones]

On Tue, 22 Mar 2022, Stephen Rothwell wrote:

> Hi all,
> 
> Today's linux-next merge of the devicetree tree got a conflict in:
> 
>   Documentation/devicetree/bindings/mfd/syscon.yaml
> 
> between commit:
> 
>   844dd8fe02f2 ("dt-bindings: Add compatibles for undocumented trivial syscons")
> 
> from the mfd tree and commit:
> 
>   c1ff0c0f24d6 ("dt-bindings: mfd: syscon: add microchip,lan966x-cpu-syscon compatible")
> 
> from the devicetree tree.

Did you accidentally hoover this up Rob?

-- 
Lee Jones [李琼斯]
Principal Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog

linux-next: manual merge of the devicetree tree with the mfd tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1559 bytes --]

Hi all,

Today's linux-next merge of the devicetree tree got a conflict in:

  Documentation/devicetree/bindings/mfd/syscon.yaml

between commit:

  844dd8fe02f2 ("dt-bindings: Add compatibles for undocumented trivial syscons")

from the mfd tree and commit:

  c1ff0c0f24d6 ("dt-bindings: mfd: syscon: add microchip,lan966x-cpu-syscon compatible")

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/mfd/syscon.yaml
index 29d4a97f7108,5aa0daa55533..000000000000
--- a/Documentation/devicetree/bindings/mfd/syscon.yaml
+++ b/Documentation/devicetree/bindings/mfd/syscon.yaml
@@@ -44,10 -44,7 +44,11 @@@ properties
                - hisilicon,hi6220-sramctrl
                - hisilicon,pcie-sas-subctrl
                - hisilicon,peri-subctrl
 +              - intel,lgm-syscon
 +              - marvell,armada-3700-usb2-host-misc
 +              - mediatek,mt8135-pctl-a-syscfg
 +              - mediatek,mt8135-pctl-b-syscfg
+               - microchip,lan966x-cpu-syscon
                - microchip,sparx5-cpu-syscon
                - mstar,msc313-pmsleep
                - rockchip,px30-qos

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the devicetree tree with the mfd tree

[Leizhen (ThunderTown)]

On 2020/10/1 20:31, Rob Herring wrote:
> On Thu, Oct 1, 2020 at 1:26 AM Krzysztof Kozlowski <krzk@kernel.org> wrote:
>>
>> On Thu, 1 Oct 2020 at 08:22, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>>
>>> Hi all,
>>>
>>> Today's linux-next merge of the devicetree tree got a conflict in:
>>>
>>>   Documentation/devicetree/bindings/mfd/syscon.yaml
>>>
>>> between commit:
>>>
>>>   18394297562a ("dt-bindings: mfd: syscon: Merge Samsung Exynos Sysreg bindings")
>>>   05027df1b94f ("dt-bindings: mfd: syscon: Document Exynos3 and Exynos5433 compatibles")
>>>
>>> from the mfd tree and commit:
>>>
>>>   35b096dd6353 ("dt-bindings: mfd: syscon: add some compatible strings for Hisilicon")
>>>
>>> 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/mfd/syscon.yaml
>>> index 0f21943dea28,fc2e85004d36..000000000000
>>> --- a/Documentation/devicetree/bindings/mfd/syscon.yaml
>>> +++ b/Documentation/devicetree/bindings/mfd/syscon.yaml
>>> @@@ -40,11 -40,10 +40,14 @@@ properties
>>>                 - allwinner,sun50i-a64-system-controller
>>>                 - microchip,sparx5-cpu-syscon
>>>                 - mstar,msc313-pmsleep
>>>  +              - samsung,exynos3-sysreg
>>>  +              - samsung,exynos4-sysreg
>>>  +              - samsung,exynos5-sysreg
>>>  +              - samsung,exynos5433-sysreg
>>> -
>>> +               - hisilicon,hi6220-sramctrl
>>> +               - hisilicon,pcie-sas-subctrl
>>> +               - hisilicon,peri-subctrl
>>> +               - hisilicon,dsa-subctrl
>>
>> Thanks Stephen, looks good.
>>
>> Zhei,
>> However the Huawei compatibles in the original patch were added not
>> alphabetically which messes the order and increases the possibility of
>> conflicts. It would be better if the entries were kept ordered.
> 
> I've fixed up the order.

Thanks.

> 
> Rob
> 
> .
> 

Re: linux-next: manual merge of the devicetree tree with the mfd tree

[Rob Herring]

On Thu, Oct 1, 2020 at 1:26 AM Krzysztof Kozlowski <krzk@kernel.org> wrote:
>
> On Thu, 1 Oct 2020 at 08:22, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > Today's linux-next merge of the devicetree tree got a conflict in:
> >
> >   Documentation/devicetree/bindings/mfd/syscon.yaml
> >
> > between commit:
> >
> >   18394297562a ("dt-bindings: mfd: syscon: Merge Samsung Exynos Sysreg bindings")
> >   05027df1b94f ("dt-bindings: mfd: syscon: Document Exynos3 and Exynos5433 compatibles")
> >
> > from the mfd tree and commit:
> >
> >   35b096dd6353 ("dt-bindings: mfd: syscon: add some compatible strings for Hisilicon")
> >
> > 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/mfd/syscon.yaml
> > index 0f21943dea28,fc2e85004d36..000000000000
> > --- a/Documentation/devicetree/bindings/mfd/syscon.yaml
> > +++ b/Documentation/devicetree/bindings/mfd/syscon.yaml
> > @@@ -40,11 -40,10 +40,14 @@@ properties
> >                 - allwinner,sun50i-a64-system-controller
> >                 - microchip,sparx5-cpu-syscon
> >                 - mstar,msc313-pmsleep
> >  +              - samsung,exynos3-sysreg
> >  +              - samsung,exynos4-sysreg
> >  +              - samsung,exynos5-sysreg
> >  +              - samsung,exynos5433-sysreg
> > -
> > +               - hisilicon,hi6220-sramctrl
> > +               - hisilicon,pcie-sas-subctrl
> > +               - hisilicon,peri-subctrl
> > +               - hisilicon,dsa-subctrl
>
> Thanks Stephen, looks good.
>
> Zhei,
> However the Huawei compatibles in the original patch were added not
> alphabetically which messes the order and increases the possibility of
> conflicts. It would be better if the entries were kept ordered.

I've fixed up the order.

Rob

Re: linux-next: manual merge of the devicetree tree with the mfd tree

[Krzysztof Kozlowski]

On Thu, 1 Oct 2020 at 08:22, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the devicetree tree got a conflict in:
>
>   Documentation/devicetree/bindings/mfd/syscon.yaml
>
> between commit:
>
>   18394297562a ("dt-bindings: mfd: syscon: Merge Samsung Exynos Sysreg bindings")
>   05027df1b94f ("dt-bindings: mfd: syscon: Document Exynos3 and Exynos5433 compatibles")
>
> from the mfd tree and commit:
>
>   35b096dd6353 ("dt-bindings: mfd: syscon: add some compatible strings for Hisilicon")
>
> 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/mfd/syscon.yaml
> index 0f21943dea28,fc2e85004d36..000000000000
> --- a/Documentation/devicetree/bindings/mfd/syscon.yaml
> +++ b/Documentation/devicetree/bindings/mfd/syscon.yaml
> @@@ -40,11 -40,10 +40,14 @@@ properties
>                 - allwinner,sun50i-a64-system-controller
>                 - microchip,sparx5-cpu-syscon
>                 - mstar,msc313-pmsleep
>  +              - samsung,exynos3-sysreg
>  +              - samsung,exynos4-sysreg
>  +              - samsung,exynos5-sysreg
>  +              - samsung,exynos5433-sysreg
> -
> +               - hisilicon,hi6220-sramctrl
> +               - hisilicon,pcie-sas-subctrl
> +               - hisilicon,peri-subctrl
> +               - hisilicon,dsa-subctrl

Thanks Stephen, looks good.

Zhei,
However the Huawei compatibles in the original patch were added not
alphabetically which messes the order and increases the possibility of
conflicts. It would be better if the entries were kept ordered.

Best regards,
Krzysztof

>             - const: syscon
>
>         - contains:

linux-next: manual merge of the devicetree tree with the mfd tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1704 bytes --]

Hi all,

Today's linux-next merge of the devicetree tree got a conflict in:

  Documentation/devicetree/bindings/mfd/syscon.yaml

between commit:

  18394297562a ("dt-bindings: mfd: syscon: Merge Samsung Exynos Sysreg bindings")
  05027df1b94f ("dt-bindings: mfd: syscon: Document Exynos3 and Exynos5433 compatibles")

from the mfd tree and commit:

  35b096dd6353 ("dt-bindings: mfd: syscon: add some compatible strings for Hisilicon")

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/mfd/syscon.yaml
index 0f21943dea28,fc2e85004d36..000000000000
--- a/Documentation/devicetree/bindings/mfd/syscon.yaml
+++ b/Documentation/devicetree/bindings/mfd/syscon.yaml
@@@ -40,11 -40,10 +40,14 @@@ properties
                - allwinner,sun50i-a64-system-controller
                - microchip,sparx5-cpu-syscon
                - mstar,msc313-pmsleep
 +              - samsung,exynos3-sysreg
 +              - samsung,exynos4-sysreg
 +              - samsung,exynos5-sysreg
 +              - samsung,exynos5433-sysreg
- 
+               - hisilicon,hi6220-sramctrl
+               - hisilicon,pcie-sas-subctrl
+               - hisilicon,peri-subctrl
+               - hisilicon,dsa-subctrl
            - const: syscon
  
        - contains:

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]