linux-kernel - Re: linux-next: manual merge of the char-misc tree with the arm-soc 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: <YjBBrIlZkn7dGm9y@kroah.com>
Date:   Tue, 15 Mar 2022 08:35:08 +0100
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Arnd Bergmann <arnd@...db.de>, Olof Johansson <olof@...om.net>,
        ARM <linux-arm-kernel@...ts.infradead.org>,
        Bjorn Andersson <bjorn.andersson@...aro.org>,
        David Heidelberg <david@...t.cz>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Luca Weiss <luca@...tu.xyz>, Vinod Koul <vkoul@...nel.org>
Subject: Re: linux-next: manual merge of the char-misc tree with the arm-soc
 tree

On Tue, Mar 15, 2022 at 04:51:33PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.txt
> 
> between commit:
> 
>   c04421c68fd4 ("dt-bindings: phy: qcom,usb-hs-phy: add MSM8226 compatible")
> 
> from the arm-soc tree and commit:
> 
>   e7393b60a14f ("dt-bindings: phy: convert Qualcomm USB HS phy to yaml")
> 
> from the char-misc tree.
> 
> I fixed it up (I removed the file and added the following patch) 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.
> 
> From: Stephen Rothwell <sfr@...b.auug.org.au>
> Date: Tue, 15 Mar 2022 16:48:51 +1100
> Subject: [PATCH] fixup for "dt-bindings: phy: convert Qualcomm USB HS phy to yaml"
> 
> Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
> ---
>  Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
> index a60386bd19b2..e23e5590eaa3 100644
> --- a/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
> +++ b/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
> @@ -38,6 +38,7 @@ properties:
>      items:
>        - enum:
>            - qcom,usb-hs-phy-apq8064
> +          - qcom,usb-hs-phy-msm8226
>            - qcom,usb-hs-phy-msm8916
>            - qcom,usb-hs-phy-msm8974
>        - const: qcom,usb-hs-phy
> -- 
> 2.34.1
> 
> -- 
> Cheers,
> Stephen Rothwell



Looks good, thanks!