The patch below does not apply to the 5.10-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-5.10.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 '2024081239-hardcover-dipping-96fb@gregkh' --subject-prefix 'PATCH 5.10.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") 15fd09a05a66 ("drm/amdgpu: add reset register dump trace on GPU") 21a6732f4648 ("drm/amdgpu: don't skip runtime pm get on A+A config") 8c505bdc9c8b ("drm/amdgpu: rework dma_resv handling v3") d3fae3b3daac ("dma-buf: drop the _rcu postfix on function names v3") fb5ce730f214 ("dma-buf: rename and cleanup dma_resv_get_list v2") 6edbd6abb783 ("dma-buf: rename and cleanup dma_resv_get_excl v3") 0c6b522abc2a ("dma-buf: cleanup dma-resv shared fence debugging a bit v2") 068d9d754bc1 ("dma-buf: add SPDX header and fix style in dma-resv.c") 680753dd9d7d ("dma-buf: fix inconsistent debug print v2") 71df0368e9b6 ("drm/amdgpu: Implement mmap as GEM object function") 304ba5dca49a ("Merge drm/drm-next into drm-misc-next") thanks, greg k-h ------------------ original commit in Linus's tree ------------------