linux-kernel - Re: linux-next: manual merge of the phy-next tree with the usb 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20210827165822.7186411f@canb.auug.org.au>
Date:   Fri, 27 Aug 2021 16:58:22 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Vinod Koul <vkoul@...nel.org>, Greg KH <greg@...ah.com>
Cc:     Kishon Vijay Abraham I <kishon@...com>,
        Bjorn Andersson <bjorn.andersson@...aro.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Sandeep Maheswaram <sanm@...eaurora.org>
Subject: Re: linux-next: manual merge of the phy-next tree with the usb tree

Hi all,

On Mon, 9 Aug 2021 17:10:23 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the phy-next tree got a conflict in:
> 
>   Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
> 
> between commit:
> 
>   e516ac5d48fe ("dt-bindings: phy: qcom,qmp-usb3-dp: Add support for SC7280")
> 
> from the usb tree and commit:
> 
>   1a00d130596f ("dt-bindings: phy: qcom,qmp-usb3-dp: Add support for sc8180x")
> 
> from the phy-next tree.
> 
> 
> diff --cc Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
> index 20199833f144,1d49cc3d4eae..000000000000
> --- a/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
> +++ b/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
> @@@ -14,7 -14,7 +14,8 @@@ properties
>     compatible:
>       enum:
>         - qcom,sc7180-qmp-usb3-dp-phy
>  +      - qcom,sc7280-qmp-usb3-dp-phy
> +       - qcom,sc8180x-qmp-usb3-dp-phy
>         - qcom,sdm845-qmp-usb3-dp-phy
>         - qcom,sm8250-qmp-usb3-dp-phy
>     reg:

This is now a conflict between the char-misc tree and the usb tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped