On 30/09/2022 14:45, Lee Jones wrote:
> On Fri, 30 Sep 2022, Krzysztof Kozlowski wrote:
>
>> On 30/09/2022 13:58, broonie@xxxxxxxxxx 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@xxxxxxxxxx/
Best regards,
Krzysztof
