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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1542 bytes --]

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:

  393e132efcc5 ("dt-bindings: phy: qcom,sc8280xp-qmp-pcie-phy: Update pcie phy bindings for qcs8300")

from the phy tree and commit:

  25671c378210 ("dt-bindings: phy: sc8280xp-qmp-pcie: Document Glymur PCIe Gen4 2-lanes PHY")

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 f5068df20cfe,82316aa5e15f..000000000000
--- a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml
@@@ -178,8 -182,8 +181,9 @@@ allOf
          compatible:
            contains:
              enum:
+               - qcom,glymur-qmp-gen4x2-pcie-phy
                - qcom,glymur-qmp-gen5x4-pcie-phy
 +              - qcom,qcs8300-qmp-gen4x2-pcie-phy
                - qcom,sa8775p-qmp-gen4x2-pcie-phy
                - qcom,sa8775p-qmp-gen4x4-pcie-phy
                - qcom,sc8280xp-qmp-gen3x1-pcie-phy

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]