The patch below does not apply to the 5.4-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.4.y git checkout FETCH_HEAD git cherry-pick -x cf4d6d54eadb60d2ee4d31c9d92299f5e8dcb55c # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024072512-saline-founder-7ebe@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: cf4d6d54eadb ("arm64: dts: qcom: sdm845: Disable SS instance in Parkmode for USB") ca5ca568d738 ("arm64: dts: qcom: sdm845: switch USB QMP PHY to new style of bindings") a9ecdec45a3a ("arm64: dts: qcom: sdm845: switch USB+DP QMP PHY to new style of bindings") 8fe25ba3ffec ("arm64: dts: qcom: sdm845: rename labels for DSI nodes") 8721e18ca696 ("arm64: dts: qcom: enable dual ("bonded") DSI mode for DB845c") 39e0f8076f6f ("arm64: dts: qcom: sdm845-tama: Enable remoteprocs") 5dcc6587fde2 ("arm64: dts: qcom: sdm845-tama: Add display nodes") e12482e68830 ("arm64: dts: qcom: sdm845-xiaomi-beryllium: drop invalid panel properties") 9f3c858ecde0 ("arm64: dts: qcom: sdm845-oneplus: drop invalid panel properties") 4ce03bb80fae ("arm64: dts: qcom: sdm845-tama: Add volume up and camera GPIO keys") a1a685c312f5 ("arm64: dts: qcom: sdm845: Add compat qcom,sdm845-dsi-ctrl") ea25d61b448a ("arm64: dts: qcom: Use plural _gpios node label for PMIC gpios") 67e75cfea375 ("arm64: dts: qcom: Add Lenovo Tab P11 (J606F/XiaoXin Pad) dts") cb3920b50b4d ("arm64: dts: qcom: align LED node names with dtschema") f86ae6f23a9e ("arm64: dts: qcom: sagit: add initial device tree for sagit") 0d97fdf380b4 ("arm64: dts: qcom: Add configuration for PMI8950 peripheral") e07f41b0e1db ("arm64: dts: qcom: Add configuration for PM8950 peripheral") 108162894a5d ("arm64: dts: qcom: sdm845-*: Fix up comments") 4ba146dd8897 ("arm64: dts: qcom: sm6125-seine: Configure additional trinket thermistors") 7401035f2ef8 ("arm64: dts: qcom: sm6125-seine: Include PM6125 and configure PON") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
