Merge v6.9-rc6 into drm-next
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 29 Apr 2024 18:22:39 +0000 (20:22 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 29 Apr 2024 18:22:39 +0000 (20:22 +0200)
commitb84bc948528e6474ba48596144e9c17466a98448
tree194e9a20ae9ec40614937de8a23753908bffc75e
parent2236a61bd4917e85039ff318c39e1524beb10362
parente67572cd2204894179d89bd7b984072f19313b03
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 <daniel.vetter@ffwll.ch>
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
drivers/gpu/drm/amd/pm/amdgpu_pm.c
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c