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

Backmerging to get v6.9-rc2 changes into drm-misc-next.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>

diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
Simple merge

diff --cc MAINTAINERS
index 13a69b4731c701213fa3fcf461c580319ad06f25,7c121493f43d01e610219a8509dd38e181580388..fb1fef1aebe06160d10b30b4e96bd7398ff35ebf
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -10496,8 -10590,9 +10601,9 @@@ IMGTEC POWERVR DRM DRIVE
  M:    Frank Binns <frank.binns@imgtec.com>
  M:    Matt Coster <matt.coster@imgtec.com>
  S:    Supported
 -T:    git git://anongit.freedesktop.org/drm/drm-misc
 +T:    git https://gitlab.freedesktop.org/drm/misc/kernel.git
- F:    Documentation/devicetree/bindings/gpu/img,powervr.yaml
+ F:    Documentation/devicetree/bindings/gpu/img,powervr-rogue.yaml
+ F:    Documentation/devicetree/bindings/gpu/img,powervr-sgx.yaml
  F:    Documentation/gpu/imagination/
  F:    drivers/gpu/drm/imagination/
  F:    include/uapi/drm/pvr_drm.h

diff --cc drivers/gpu/drm/Kconfig
Simple merge

diff --cc drivers/gpu/drm/display/drm_dp_helper.c
Simple merge

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

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

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

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

diff --cc include/linux/fb.h
Simple merge