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 030631e97b209481edbac38000d2a60fd340f6b1 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024081237-geek-nag-bcd6@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 030631e97b20 ("drm/amdgpu: revert "take runtime pm reference when we attach a buffer" v2") 425285d39afd ("drm/amdgpu: add amdgpu runpm usage trace for separate funcs") thanks, greg k-h ------------------ original commit in Linus's tree ------------------