Re: linux-next: manual merge of the phy-next tree with the usb tree

[Greg KH]

On Wed, Oct 04, 2023 at 01:00:34PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the phy-next tree got a conflict in:
> 
>   Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml
> 
> between commit:
> 
>   df55d4f814f9 ("dt-bindings: phy: qcom,qmp-usb: Add SDX75 USB3 PHY")
> 
> from the usb tree and commit:
> 
>   15c83637402c ("dt-bindings: phy: migrate QMP USB PHY bindings to qcom,sc8280xp-qmp-usb3-uni-phy.yaml")
> 
> from the phy-next tree.
> 
> I fixed it up (see below) 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.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml
> index d58dd744d5d2,bbdb28cd8029..000000000000
> --- a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml
> +++ b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml
> @@@ -20,8 -24,14 +24,15 @@@ properties
>         - qcom,qcm2290-qmp-usb3-phy
>         - qcom,sa8775p-qmp-usb3-uni-phy
>         - qcom,sc8280xp-qmp-usb3-uni-phy
> +       - qcom,sdm845-qmp-usb3-uni-phy
> +       - qcom,sdx55-qmp-usb3-uni-phy
> +       - qcom,sdx65-qmp-usb3-uni-phy
>  +      - qcom,sdx75-qmp-usb3-uni-phy
>         - qcom,sm6115-qmp-usb3-phy
> +       - qcom,sm8150-qmp-usb3-uni-phy
> +       - qcom,sm8250-qmp-usb3-uni-phy
> +       - qcom,sm8350-qmp-usb3-uni-phy
> + 
>   
>     reg:
>       maxItems: 1
> @@@ -75,10 -87,17 +88,18 @@@ allOf
>           compatible:
>             contains:
>               enum:
> +               - qcom,ipq6018-qmp-usb3-phy
> +               - qcom,ipq8074-qmp-usb3-phy
>                 - qcom,ipq9574-qmp-usb3-phy
> +               - qcom,msm8996-qmp-usb3-phy
> +               - qcom,msm8998-qmp-usb3-phy
> +               - qcom,sdx55-qmp-usb3-uni-phy
> +               - qcom,sdx65-qmp-usb3-uni-phy
>  +              - qcom,sdx75-qmp-usb3-uni-phy
>       then:
>         properties:
> +         clocks:
> +           maxItems: 4
>           clock-names:
>             items:
>               - const: aux

Looks good to me, thanks!

greg k-h