On 04/07/2022 04:11, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the dt-krzk tree got a conflict in:
>
> Documentation/devicetree/bindings/arm/qcom.yaml
>
> between commit:
>
> bbd5a6891908 ("dt-bindings: arm: qcom: document sda660 SoC and ifc6560 board")
>
> from the qcom tree and commit:
>
> 4fc3efba3205 ("dt-bindings: arm: qcom: add missing SDM630 board compatibles")
>
> from the dt-krzk tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
Thanks, looks good.
Bjorn,
There is more and more of dt-bindings work pending on my board patchset
(part of this pull). I think we talked that you will pull it?
Best regards,
Krzysztof
