The patch below does not apply to the 6.6-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-6.6.y git checkout FETCH_HEAD git cherry-pick -x 074992a1163295d717faa21d1818c4c19ef6e676 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024072522-properly-jackpot-9fed@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: 074992a11632 ("arm64: dts: qcom: sm6115: Disable SS instance in Parkmode for USB") a06a2f12f9e2 ("arm64: dts: qcom: qrb4210-rb2: enable USB-C port handling") 7e3a1f6470f7 ("arm64: dts: qcom: sm6115: drop pipe clock selection") b3eaa47395b9 ("arm64: dts: qcom: sm6115: Hook up interconnects") f6874706e311 ("arm64: dts: qcom: sm6115: switch UFS QMP PHY to new style of bindings") ff753723bf39 ("arm64: dts: qcom: qrb4210-rb2: Enable MPSS and Wi-Fi") cab60b166575 ("arm64: dts: qcom: qrb4210-rb2: Enable bluetooth") ba5f5610841f ("arm64: dts: qcom: sm6115: Add UART3") 27c2ca90e2f3 ("arm64: dts: qcom: qrb4210-rb2: don't force usb peripheral mode") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
