Subject: linux-next: manual merge of the phy-next tree with the phy tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 23 Oct 2024 14:15:34 +1100

Hi all,

Today's linux-next merge of the phy-next tree got a conflict in:

  Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml

between commit:

  16fde3e07677 ("dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: Fix X1E80100 resets entries")

from the phy tree and commit:

  26fb23ce35e2 ("dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: Document the X1E80100 QMP PCIe PHY Gen4 x8")

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-pcie-phy.yaml
index 380a9222a51d,680ec3113c2b..000000000000
--- a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml
@@@ -169,9 -172,8 +170,10 @@@ allOf
                - qcom,sc8280xp-qmp-gen3x1-pcie-phy
                - qcom,sc8280xp-qmp-gen3x2-pcie-phy
                - qcom,sc8280xp-qmp-gen3x4-pcie-phy
 +              - qcom,x1e80100-qmp-gen3x2-pcie-phy
 +              - qcom,x1e80100-qmp-gen4x2-pcie-phy
                - qcom,x1e80100-qmp-gen4x4-pcie-phy
+               - qcom,x1e80100-qmp-gen4x8-pcie-phy
      then:
        properties:
          clocks:
@@@ -201,7 -203,7 +203,8 @@@
                - qcom,sm8550-qmp-gen4x2-pcie-phy
                - qcom,sm8650-qmp-gen4x2-pcie-phy
                - qcom,x1e80100-qmp-gen4x2-pcie-phy
 +              - qcom,x1e80100-qmp-gen4x4-pcie-phy
+               - qcom,x1e80100-qmp-gen4x8-pcie-phy
      then:
        properties:
          resets: