linux-kernel - linux-next: manual merge of the phy-next tree with the phy 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>] [day] [month] [year] [list]

Message-ID: <20241023141534.380b0585@canb.auug.org.au>
Date: Wed, 23 Oct 2024 14:15:34 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Kishon Vijay Abraham I <kishon@...nel.org>, Vinod Koul
 <vkoul@...nel.org>
Cc: Abel Vesa <abel.vesa@...aro.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Qiang Yu <quic_qianyu@...cinc.com>
Subject: linux-next: manual merge of the phy-next tree with the phy tree

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:

Content of type "application/pgp-signature" skipped