The patch below does not apply to the 4.19-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-4.19.y git checkout FETCH_HEAD git cherry-pick -x 44ea1ae3cf95db97e10d6ce17527948121f1dd4b # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024072534-unguarded-atonable-f64d@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^.. Possible dependencies: 44ea1ae3cf95 ("arm64: dts: qcom: msm8996: Disable SS instance in Parkmode for USB") d0af0537e28f ("arm64: dts: qcom: msm8996: Add missing DWC3 quirks") 50aa72ccb30b ("arm64: dts: qcom: msm8996: Sort all nodes in msm8996.dtsi") 86f6d6225e5e ("arm64: dts: qcom: msm8996: Pad addresses") 808844314309 ("arm64: dts: qcom: msm8996: Move regulator consumers to db820c") 75b77d6492eb ("arm64: dts: qcom: msm8996: Use node references in db820c") f978d45b4aab ("arm64: dts: qcom: db820c: Move non-soc entries out of /soc") d026c96b25b7 ("arm64: dts: qcom: msm8996: Disable USB2 PHY suspend by core") 4e300e439af3 ("arm64: dts: qcom: msm8996: Add Venus video codec DT node") d98de8efa19f ("arm64: dts: qcom: msm8996: Add Coresight support") 887e54218183 ("arm64: dts: qcom: msm8996: Rename smmu nodes") 72825e7f4a63 ("arm64: dts: qcom: msm8996: Enable SMMUs") 64a68a736068 ("arm64: dts: qcom: msm8996: Correct apr-domain property") 693e824452e5 ("arm64: dts: qcom: msm8996: Stop using legacy clock names") 3a2b37b09f74 ("arm64: dts: msm8996: Add UFS PHY reset controller") f3eb39a55a1f ("arm64: dts: db820c: Add sound card support") 1ad69b695582 ("arm64: dts: apq8096-db820c: Add HDMI display support") 69cc3114ab0f ("arm64: dts: Add Adreno GPU definitions") 3a4547c1fc2f ("arm64: qcom: msm8996.dtsi: Add Display nodes") 953f65737006 ("arm64: dts: msm8996: Add display smmu node") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
