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

Posted by broonie@kernel.org 1 year, 6 months ago

Hi all,

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

  Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml

between commit:

  4f2e28b2cc2e0 ("dt-bindings: mfd: qcom,tcsr: add several devices")

from the qcom tree and commits:

  f8c1940165bea ("dt-bindings: mfd: qcom,tcsr: Add several devices")
  a328ae8504dbc ("dt-bindings: mfd: qcom,tcsr: Drop simple-mfd from IPQ6018")

from the mfd 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/mfd/qcom,tcsr.yaml
index d3c25daa995e4,b12809b5cc22e..0000000000000
--- a/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
+++ b/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
@@@ -15,31 -15,27 +15,27 @@@ description
  
  properties:
    compatible:
 -    items:
 -      - enum:
 -          - qcom,msm8998-tcsr
 -          - qcom,qcs404-tcsr
 -          - qcom,sc7180-tcsr
 -          - qcom,sc7280-tcsr
 -          - qcom,sdm630-tcsr
 -          - qcom,sdm845-tcsr
 -          - qcom,sm8150-tcsr
 -          - qcom,tcsr-apq8064
 -          - qcom,tcsr-apq8084
 -          - qcom,tcsr-ipq6018
 -          - qcom,tcsr-ipq8064
 -          - qcom,tcsr-mdm9615
 -          - qcom,tcsr-msm8660
 -          - qcom,tcsr-msm8916
 -          - qcom,tcsr-msm8953
 -          - qcom,tcsr-msm8960
 -          - qcom,tcsr-msm8974
 -          - qcom,tcsr-msm8996
 -      - const: syscon
 +    oneOf:
 +      - items:
 +          - enum:
 +              - qcom,msm8998-tcsr
 +              - qcom,qcs404-tcsr
 +              - qcom,sc7180-tcsr
 +              - qcom,sc7280-tcsr
 +              - qcom,sdm630-tcsr
 +              - qcom,sdm845-tcsr
 +              - qcom,sm8150-tcsr
 +              - qcom,tcsr-apq8064
 +              - qcom,tcsr-apq8084
 +              - qcom,tcsr-ipq8064
 +              - qcom,tcsr-mdm9615
 +              - qcom,tcsr-msm8660
 +              - qcom,tcsr-msm8916
 +              - qcom,tcsr-msm8953
 +              - qcom,tcsr-msm8960
 +              - qcom,tcsr-msm8974
 +              - qcom,tcsr-msm8996
 +          - const: syscon
-       - items:
-           - const: qcom,tcsr-ipq6018
-           - const: syscon
-           - const: simple-mfd
  
    reg:
      maxItems: 1

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

Posted by Krzysztof Kozlowski 1 year, 6 months ago

On 30/09/2022 13:58, broonie@kernel.org wrote:
> Hi all,
> 
> Today's linux-next merge of the mfd tree got a conflict in:
> 
>   Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
> 

Thanks Mark.

> between commit:
> 
>   4f2e28b2cc2e0 ("dt-bindings: mfd: qcom,tcsr: add several devices")

It seems this commit was picked by both Bjorn/qcom and Lee/MFD.

> 
> from the qcom tree and commits:
> 
>   f8c1940165bea ("dt-bindings: mfd: qcom,tcsr: Add several devices")
>   a328ae8504dbc ("dt-bindings: mfd: qcom,tcsr: Drop simple-mfd from IPQ6018")

This commit depends on the duplicated one (on "Add several devices"), so
I think all set can stay in MFD and instead Bjorn could drop his copy of
the commit.

If not, please propagate the merge conflict resolution, but not the one
from Mark.

Instead result should look like a328ae8504dbc (from MFD tree).


> 
> from the mfd 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/mfd/qcom,tcsr.yaml
> index d3c25daa995e4,b12809b5cc22e..0000000000000
> --- a/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
> +++ b/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
> @@@ -15,31 -15,27 +15,27 @@@ description
>   
>   properties:
>     compatible:
>  -    items:
>  -      - enum:
>  -          - qcom,msm8998-tcsr
>  -          - qcom,qcs404-tcsr
>  -          - qcom,sc7180-tcsr
>  -          - qcom,sc7280-tcsr
>  -          - qcom,sdm630-tcsr
>  -          - qcom,sdm845-tcsr
>  -          - qcom,sm8150-tcsr
>  -          - qcom,tcsr-apq8064
>  -          - qcom,tcsr-apq8084
>  -          - qcom,tcsr-ipq6018
>  -          - qcom,tcsr-ipq8064
>  -          - qcom,tcsr-mdm9615
>  -          - qcom,tcsr-msm8660
>  -          - qcom,tcsr-msm8916
>  -          - qcom,tcsr-msm8953
>  -          - qcom,tcsr-msm8960
>  -          - qcom,tcsr-msm8974
>  -          - qcom,tcsr-msm8996
>  -      - const: syscon
>  +    oneOf:
>  +      - items:
>  +          - enum:
>  +              - qcom,msm8998-tcsr
>  +              - qcom,qcs404-tcsr
>  +              - qcom,sc7180-tcsr
>  +              - qcom,sc7280-tcsr
>  +              - qcom,sdm630-tcsr
>  +              - qcom,sdm845-tcsr
>  +              - qcom,sm8150-tcsr
>  +              - qcom,tcsr-apq8064
>  +              - qcom,tcsr-apq8084

This misses ipq6018. Please chose solely the MFD branch/side.

>  +              - qcom,tcsr-ipq8064

Best regards,
Krzysztof

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

Posted by Stephen Rothwell 1 year, 6 months ago

Hi all,

On Fri, 30 Sep 2022 14:06:28 +0200 Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote:
>
> On 30/09/2022 13:58, broonie@kernel.org wrote:
> > 
> > Today's linux-next merge of the mfd tree got a conflict in:
> > 
> >   Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
> 
> Thanks Mark.
> 
> > between commit:
> > 
> >   4f2e28b2cc2e0 ("dt-bindings: mfd: qcom,tcsr: add several devices")  
> 
> It seems this commit was picked by both Bjorn/qcom and Lee/MFD.
> 
> > from the qcom tree and commits:
> > 
> >   f8c1940165bea ("dt-bindings: mfd: qcom,tcsr: Add several devices")
> >   a328ae8504dbc ("dt-bindings: mfd: qcom,tcsr: Drop simple-mfd from IPQ6018")  
> 
> This commit depends on the duplicated one (on "Add several devices"), so
> I think all set can stay in MFD and instead Bjorn could drop his copy of
> the commit.
> 
> If not, please propagate the merge conflict resolution, but not the one
> from Mark.
> 
> Instead result should look like a328ae8504dbc (from MFD tree).

OK, in linux-next, the resolution is now to take the mfd tree version.

-- 
Cheers,
Stephen Rothwell

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

Posted by Lee Jones 1 year, 6 months ago

On Fri, 30 Sep 2022, Krzysztof Kozlowski wrote:

> On 30/09/2022 13:58, broonie@kernel.org wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the mfd tree got a conflict in:
> > 
> >   Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
> > 
> 
> Thanks Mark.
> 
> > between commit:
> > 
> >   4f2e28b2cc2e0 ("dt-bindings: mfd: qcom,tcsr: add several devices")
> 
> It seems this commit was picked by both Bjorn/qcom and Lee/MFD.
> 
> > 
> > from the qcom tree and commits:
> > 
> >   f8c1940165bea ("dt-bindings: mfd: qcom,tcsr: Add several devices")
> >   a328ae8504dbc ("dt-bindings: mfd: qcom,tcsr: Drop simple-mfd from IPQ6018")
> 
> This commit depends on the duplicated one (on "Add several devices"), so
> I think all set can stay in MFD and instead Bjorn could drop his copy of
> the commit.

Not sure why Bjorn is picking up MFD patches?

Was this a mistake Bjorn?

-- 
Lee Jones [李琼斯]

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

Posted by Krzysztof Kozlowski 1 year, 6 months ago

On 30/09/2022 14:45, Lee Jones wrote:
> On Fri, 30 Sep 2022, Krzysztof Kozlowski wrote:
> 
>> On 30/09/2022 13:58, broonie@kernel.org wrote:
>>> Hi all,
>>>
>>> Today's linux-next merge of the mfd tree got a conflict in:
>>>
>>>   Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
>>>
>>
>> Thanks Mark.
>>
>>> between commit:
>>>
>>>   4f2e28b2cc2e0 ("dt-bindings: mfd: qcom,tcsr: add several devices")
>>
>> It seems this commit was picked by both Bjorn/qcom and Lee/MFD.
>>
>>>
>>> from the qcom tree and commits:
>>>
>>>   f8c1940165bea ("dt-bindings: mfd: qcom,tcsr: Add several devices")
>>>   a328ae8504dbc ("dt-bindings: mfd: qcom,tcsr: Drop simple-mfd from IPQ6018")
>>
>> This commit depends on the duplicated one (on "Add several devices"), so
>> I think all set can stay in MFD and instead Bjorn could drop his copy of
>> the commit.
> 
> Not sure why Bjorn is picking up MFD patches?
> 
> Was this a mistake Bjorn?


This was a part of big set MFD + ARM64 dts, so I guess it just slipped in:

https://lore.kernel.org/all/20220819083209.50844-1-krzysztof.kozlowski@linaro.org/

Best regards,
Krzysztof

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

Posted by Lee Jones 1 year, 6 months ago

On Fri, 30 Sep 2022, Krzysztof Kozlowski wrote:

> On 30/09/2022 14:45, Lee Jones wrote:
> > On Fri, 30 Sep 2022, Krzysztof Kozlowski wrote:
> > 
> >> On 30/09/2022 13:58, broonie@kernel.org wrote:
> >>> Hi all,
> >>>
> >>> Today's linux-next merge of the mfd tree got a conflict in:
> >>>
> >>>   Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
> >>>
> >>
> >> Thanks Mark.
> >>
> >>> between commit:
> >>>
> >>>   4f2e28b2cc2e0 ("dt-bindings: mfd: qcom,tcsr: add several devices")
> >>
> >> It seems this commit was picked by both Bjorn/qcom and Lee/MFD.
> >>
> >>>
> >>> from the qcom tree and commits:
> >>>
> >>>   f8c1940165bea ("dt-bindings: mfd: qcom,tcsr: Add several devices")
> >>>   a328ae8504dbc ("dt-bindings: mfd: qcom,tcsr: Drop simple-mfd from IPQ6018")
> >>
> >> This commit depends on the duplicated one (on "Add several devices"), so
> >> I think all set can stay in MFD and instead Bjorn could drop his copy of
> >> the commit.
> > 
> > Not sure why Bjorn is picking up MFD patches?
> > 
> > Was this a mistake Bjorn?
> 
> 
> This was a part of big set MFD + ARM64 dts, so I guess it just slipped in:
> 
> https://lore.kernel.org/all/20220819083209.50844-1-krzysztof.kozlowski@linaro.org/

Thanks for the info.

Fair enough.  It happens.

-- 
Lee Jones [李琼斯]