From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Kishon Vijay Abraham I <kishon@kernel•org>,
Vinod Koul <vkoul@kernel•org>
Cc: Abel Vesa <abel.vesa@linaro•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Qiang Yu <quic_qianyu@quicinc•com>
Subject: linux-next: manual merge of the phy-next tree with the phy tree
Date: Wed, 23 Oct 2024 14:15:34 +1100 [thread overview]
Message-ID: <20241023141534.380b0585@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1938 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:
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:
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-10-23 3:15 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-23 3:15 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-01-05 3:59 linux-next: manual merge of the phy-next tree with the phy tree Stephen Rothwell
2025-05-15 7:14 Stephen Rothwell
2025-05-20 8:07 ` Geert Uytterhoeven
2025-05-15 7:09 Stephen Rothwell
2025-05-15 9:11 ` Prabhakar Mahadev Lad
2025-05-15 10:38 ` Vinod Koul
2025-05-15 10:38 ` Vinod Koul
2024-02-19 3:44 Stephen Rothwell
2024-02-19 4:06 ` Stephen Rothwell
2024-02-19 6:13 ` Vinod Koul
2024-01-25 1:33 Stephen Rothwell
2024-01-25 11:41 ` Vinod Koul
2023-09-25 3:16 Stephen Rothwell
2023-09-25 3:24 ` Stephen Rothwell
2023-09-25 3:10 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241023141534.380b0585@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=abel.vesa@linaro$(echo .)org \
--cc=kishon@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=quic_qianyu@quicinc$(echo .)com \
--cc=vkoul@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox