The patch below does not apply to the 6.1-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.1.y git checkout FETCH_HEAD git cherry-pick -x 7bfb6a4289b0a63d67ec7d4ce3018cb4a7442f6a # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024071521-python-duller-bb70@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 7bfb6a4289b0 ("arm64: dts: qcom: sc8280xp-x13s: fix touchscreen power on") b01899cb1865 ("arm64: dts: qcom: sc8280xp-x13s: add hid 1.8V supplies") 31e62e862a1e ("arm64: dts: qcom: sc8280xp: rename qup0_i2c4 to i2c4") 6e1569ddfa64 ("arm64: dts: qcom: sc8280xp: rename qup2_i2c5 to i2c21") 71bc1b42844f ("arm64: dts: qcom: sc8280xp: rename qup2_uart17 to uart17") f48c70b111b4 ("arm64: dts: qcom: sc8280xp-x13s: enable eDP display") 4a883a8d80b5 ("arm64: dts: qcom: sc8280xp-crd: Enable EDP") e1deaa8437c4 ("arm64: dts: qcom: sa8295p-adp: use sa8540p-pmics") 2eb4cdcd5aba ("arm64: dts: qcom: sa8540p-ride: enable pcie2a node") f29077d86652 ("arm64: dts: qcom: sc8280xp-x13s: Add soundcard support") b8bf63f8eb72 ("arm64: dts: qcom: sa8540p-ride: enable PCIe support") 6be310347c9c ("arm64: dts: qcom: add SA8540P ride(Qdrive-3)") 30d70ec8f7fd ("arm64: dts: qcom: sa8295p-adp: Add RTC node") 123b30a75623 ("arm64: dts: qcom: sc8280xp-x13s: enable WiFi controller") 176d54acd5d9 ("arm64: dts: qcom: sc8280xp-x13s: enable modem") b4bb952e6cfc ("arm64: dts: qcom: sc8280xp-x13s: enable NVMe SSD") d907fe5acbf1 ("arm64: dts: qcom: sc8280xp-crd: enable WiFi controller") 17e2ccaf65d1 ("arm64: dts: qcom: sc8280xp-crd: enable SDX55 modem") 6a1ec5eca73c ("arm64: dts: qcom: sc8280xp-crd: enable NVMe SSD") a607fe5ea213 ("arm64: dts: qcom: sc8280xp-x13s: Add LID switch") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
