Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
Date:   Wed, 4 Oct 2023 13:00:34 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Kishon Vijay Abraham I <kishon@kernel.org>,
        Vinod Koul <vkoul@kernel.org>, Greg KH <greg@kroah.com>
Cc:     Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Rohit Agarwal <quic_rohiagar@quicinc.com>
Subject: linux-next: manual merge of the phy-next tree with the usb tree
Message-ID: <20231004130034.7b1c5b89@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Y3J+i5H.APdc/1GimyGA2.1";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/Y3J+i5H.APdc/1GimyGA2.1
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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,sc8=
280xp-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.

--=20
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
+=20
 =20
    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

--Sig_/Y3J+i5H.APdc/1GimyGA2.1
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUcx0IACgkQAVBC80lX
0Gw1xQgAiB3AkuboEx/mJcMqr10UKljRaa8sUUoM4ZaGk8u3+POVfkM/Fml5q4Q+
kbLksVJrjrBFHa2+faywkkH8NSRjLwFtHcMGqrd30YE5muAx5W6/QHb9Ji2bWY8W
CxohfOZA2sxVj+lR4D/2lbeGGIoIIfInDoPeBN+J0eNoKOHSHNVBsShwnuBmFExV
mul1AedhZ00oOcVfTUt/uBJykxhbYspljoOVrIDosvqD4FqNPHH8EYeQgMZw/nQz
x5XPs9ycUv6YvQyzykGSAjXW8vqvkOYTy6KQYScfnpy+sRxTYIjneYcfkc1rrg4y
PK+mfyzLkxXOuCtBzEbhUxWMRcTffg==
=ai3w
-----END PGP SIGNATURE-----

--Sig_/Y3J+i5H.APdc/1GimyGA2.1--