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 5b8baed4b88132c12010ce6ca1b56f00d122e376 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024072545-supermom-stinky-b4f9@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: 5b8baed4b881 ("arm64: dts: qcom: sc7180: Disable SuperSpeed instances in park mode") ebb840b00b7f ("arm64: dts: qcom: sc7180: switch USB+DP QMP PHY to new style of bindings") 2b616f86d51b ("arm64: dts: qcom: sc7180: rename labels for DSI nodes") 4a9f8f8f2ada ("arm64: dts: qcom: Add Acer Aspire 1") 39238382c499 ("arm64: dts: qcom: sc7180: Drop redundant disable in mdp") 43926a3cb191 ("arm64: dts: qcom: sc7180: Don't enable lpass clocks by default") c28d9029f3b6 ("arm64: dts: qcom: sc7180-trogdor-wormdingler: use just "port" in panel") 88904a12fbcb ("arm64: dts: qcom: sc7180-trogdor-quackingstick: use just "port" in panel") 746bda7d9dd9 ("arm64: dts: qcom: sc7180-idp: use just "port" in panel") 603f96d4c9d0 ("arm64: dts: qcom: add initial support for qcom sa8775p-ride") a45d0641d110 ("arm64: dts: qcom: sc7180: Add compat qcom,sc7180-dsi-ctrl") f5b4811e8758 ("arm64: dts: qcom: sc7180: Add trogdor eDP/touchscreen regulator off-on-time") 6be310347c9c ("arm64: dts: qcom: add SA8540P ride(Qdrive-3)") 2372bd2d5be6 ("arm64: dts: qcom: sc7180: change DSI PHY node name to generic one") 95dc5fd99972 ("arm64: dts: qcom: sc7180: Drop redundant phy-names from DSI controller") a10b760b7402 ("arm64: dts: qcom: sc7180-trogdor: Split out keyboard node and describe detachables") 6afcee78b4a4 ("arm64: dts: qcom: sc7180: Add kingoftown dts files") fb69f6adaf88 ("arm64: dts: qcom: sc7180: Add pazquel dts files") 9520fef90049 ("arm64: dts: qcom: sc7180: Add mrbland dts files") c77a3d4a2bfa ("arm64: dts: qcom: sc7180: Add quackingstick dts files") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
