From: Thomas Zimmermann <tzimmermann@suse.de>
Date: Tue, 2 Apr 2024 07:51:30 +0000 (+0200)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0d21364c6e8dc1f62c34bbc49d49935c8b01844c;p=linux.git

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>
---

0d21364c6e8dc1f62c34bbc49d49935c8b01844c
diff --cc MAINTAINERS
index 13a69b4731c70,7c121493f43d0..fb1fef1aebe06
--- a/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