linux-kernel - Re: linux-next: manual merge of the dt-krzk tree with the qcom tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <1482ae3d-7841-beca-3fa4-7e2519944086@linaro.org>
Date:   Mon, 4 Jul 2022 09:15:14 +0200
From:   Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Krzysztof Kozlowski <krzk@...nel.org>,
        Bjorn Andersson <bjorn.andersson@...aro.org>
Cc:     Andy Gross <agross@...nel.org>,
        Dmitry Baryshkov <dmitry.baryshkov@...aro.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the dt-krzk tree with the qcom tree

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