Merge v6.9-rc6 into drm-next

Thomas needs the defio fixes, Maíra needs the vkms fixes and Joonas
has some fun with i915-gem conflicts.

Signed-off-by: Daniel Vetter <[email protected]>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
Simple merge

diff --cc drivers/gpu/drm/amd/pm/amdgpu_pm.c
Simple merge

diff --cc drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
Simple merge