The patch below does not apply to the 5.15-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.15.y git checkout FETCH_HEAD git cherry-pick -x 3d930f1750ce30a6c36dbc71f8ff7e20322b94d7 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024072515-shifting-impulse-0512@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 3d930f1750ce ("arm64: dts: qcom: sc7280: Disable SuperSpeed instances in park mode") 36888ed83f99 ("arm64: dts: qcom: sc7280: switch USB+DP QMP PHY to new style of bindings") 70c4a1ca13b3 ("arm64: dts: qcom: sc7280: link usb3_phy_wrapper_gcc_usb30_pipe_clk") 531c738fb360 ("arm64: dts: qcom: sc7280: drop PCIe PHY clock index") fc6b1225d20d ("arm64: dts: qcom: sc7280: Add Display Port node") 25940788d170 ("arm64: dts: qcom: sc7280: add edp display dt nodes") 43137272f0bc ("arm64: dts: qcom: sc7280: Add DSI display nodes") fcb68dfda5cb ("arm64: dts: qcom: sc7280: add display dt nodes") bd7d507935ca ("arm64: dts: qcom: sc7280: Add pcie clock support") 92e0ee9f83b3 ("arm64: dts: qcom: sc7280: Add PCIe and PHY related nodes") 6b3207dfebdf ("arm64: dts: qcom: sc7280: Use QMP property to control load state") 7720ea001b52 ("arm64: dts: qcom: sc7280: Add QSPI node") 425f30cc843c ("arm64: dts: qcom: sc7280: fix display port phy reg property") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
