The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable@xxxxxxxxxxxxxxx>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 0046325ae52079b46da13a7f84dd7b2a6f7c38f8 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024072510-blade-spousal-6659@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 0046325ae520 ("arm64: dts: qcom: msm8998: Disable SS instance in Parkmode for USB") b7efebfeb2e8 ("arm64: dts: qcom: msm8998: switch USB QMP PHY to new style of bindings") ed9cbbcb8c6a ("arm64: dts: qcom: msm8998: drop USB PHY clock index") 1351512f29b4 ("arm64: dts: qcom: Correct QMP PHY child node name") 82d61e19fccb ("arm64: dts: qcom: msm8996: Move '#clock-cells' to QMP PHY child node") 095bbdd9a5c3 ("arm64: dts: qcom: ipq6018: Add pcie support") 63fa43224696 ("arm64: dts: qcom: sm8250: fix usb2 qmp phy node") dc2f86369b15 ("arm64: dts: qcom: sm8250: Fix pcie2_lane unit address") 59c7cf814783 ("arm64: dts: qcom: sm8350: Add UFS nodes") e780fb318fe5 ("arm64: dts: qcom: sm8350: add USB and PHY device nodes") e53bdfc00977 ("arm64: dts: qcom: sm8250: Add PCIe support") b7e8f433a673 ("arm64: dts: qcom: Add basic devicetree support for SM8350 SoC") 46a6f297d7dd ("arm64: dts: qcom: sm8250: Add USB and PHY device nodes") 0c9dde0d2015 ("arm64: dts: qcom: sm8150: Add secondary USB and PHY nodes") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
