The patch below does not apply to the 6.9-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.9.y git checkout FETCH_HEAD git cherry-pick -x df3c7dc5c58b1f85033d2cd9a121b27844700ca2 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024061931-animator-sandbag-4be3@gregkh' --subject-prefix 'PATCH 6.9.y' HEAD^.. Possible dependencies: df3c7dc5c58b ("drm/amdgpu: Reset dGPU if suspend got aborted") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
