Merge drm/drm-next into drm-misc-next

Get drm-misc-next to up v6.12-rc1.

Signed-off-by: Thomas Zimmermann <[email protected]>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/dma-buf/heaps/cma_heap.c
Simple merge

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

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

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

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

diff --cc drivers/gpu/drm/ast/ast_drv.c
Simple merge

diff --cc drivers/gpu/drm/gma500/psb_drv.c
Simple merge

diff --cc drivers/gpu/drm/mediatek/mtk_drm_drv.c
Simple merge

diff --cc drivers/gpu/drm/msm/msm_drv.c
Simple merge

diff --cc drivers/gpu/drm/msm/msm_drv.h
index 15de89b3cd3eb035ecd11f7124e68264d930731e,2e28a13446366caae48ff6291d5f88db06de645e..133e47bea7d51509016754a2de366f221d51080d
--- 1/drivers/gpu/drm/msm/msm_drv.h
--- 2/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@@ -33,16 -33,9 +33,12 @@@
  #include <drm/msm_drm.h>
  #include <drm/drm_gem.h>
  
- #ifdef CONFIG_FAULT_INJECTION
  extern struct fault_attr fail_gem_alloc;
  extern struct fault_attr fail_gem_iova;
- #else
- #  define should_fail(attr, size) 0
- #endif
  
 +struct drm_fb_helper;
 +struct drm_fb_helper_surface_size;
 +
  struct msm_kms;
  struct msm_gpu;
  struct msm_mmu;

diff --cc drivers/gpu/drm/nouveau/nouveau_drm.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_drv.c
Simple merge

diff --cc drivers/gpu/drm/rockchip/rockchip_drm_drv.c
Simple merge

diff --cc drivers/gpu/drm/tegra/drm.c
Simple merge

diff --cc drivers/gpu/drm/v3d/v3d_bo.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
Simple merge

diff --cc include/drm/drm_gem.h
Simple merge