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 1fc8c02e1d80463ce1b361d82b83fc43bb92d964 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024100702-nanometer-kilobyte-3a23@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 1fc8c02e1d80 ("clk: qcom: gcc-sc8180x: Register QUPv3 RCGs for DFS on sc8180x") 9f93a0a42860 ("clk: qcom: common: commonize qcom_cc_really_probe") aa9fc5c90814 ("clk: qcom: Add Video Clock Controller driver for SM7150") 9f0532da4226 ("clk: qcom: Add Camera Clock Controller driver for SM7150") 3829c412197e ("clk: qcom: Add Display Clock Controller driver for SM7150") 76126a5129b5 ("clk: qcom: Add camcc clock driver for x1e80100") acddef6e1744 ("clk: qcom: Add GPU clock driver for x1e80100") ee3f0739035f ("clk: qcom: Add dispcc clock driver for x1e80100") 2ff787e34174 ("clk: qcom: gcc-sm8150: Register QUPv3 RCGs for DFS on SM8150") f6bda45310ff ("clk: qcom: videocc-sm8150: Add runtime PM support") 161b7c401f4b ("clk: qcom: Add Global Clock controller (GCC) driver for X1E80100") e146252ac160 ("clk: qcom: Add ECPRICC driver support for QDU1000 and QRU1000") 8676fd4f3874 ("clk: qcom: add the SM8650 GPU Clock Controller driver") 9e939f008338 ("clk: qcom: add the SM8650 Display Clock Controller driver") e3388328e47c ("clk: qcom: add the SM8650 TCSR Clock Controller driver") aa381a2bdf1d ("clk: qcom: add the SM8650 Global Clock Controller driver, part 2") c58225b7e3d7 ("clk: qcom: add the SM8650 Global Clock Controller driver, part 1") ff93872a9c61 ("clk: qcom: camcc-sc8280xp: Add sc8280xp CAMCC") 0a6d7f8275f2 ("Merge branch 'clk-cleanup' into clk-next") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
