From: Maxime Ripard <mripard@kernel.org>
Date: Mon, 2 Dec 2024 11:44:18 +0000 (+0100)
Subject: Merge drm/drm-next into drm-misc-next
X-Git-Tag: v6.14-rc1~174^2~18^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3aba2eba84e0219fb66061359052be81bd883d53;p=thirdparty%2Fkernel%2Flinux.git

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

Kickstart 6.14 cycle.

Signed-off-by: Maxime Ripard <mripard@kernel.org>
---

3aba2eba84e0219fb66061359052be81bd883d53
diff --cc MAINTAINERS
index 713c1aa6b3061,1e930c7a58b13..d7292e0e5ae67
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1174,21 -1189,11 +1189,22 @@@ F:	Documentation/hid/amd-sfh
  F:	drivers/hid/amd-sfh-hid/
  
  AMD SPI DRIVER
- M:	Sanjay R Mehta <sanju.mehta@amd.com>
- S:	Maintained
+ M:	Raju Rangoju <Raju.Rangoju@amd.com>
+ L:	linux-spi@vger.kernel.org
+ S:	Supported
  F:	drivers/spi/spi-amd.c
  
 +AMD XDNA DRIVER
 +M:	Min Ma <min.ma@amd.com>
 +M:	Lizhi Hou <lizhi.hou@amd.com>
 +L:	dri-devel@lists.freedesktop.org
 +S:	Supported
 +T:	git https://gitlab.freedesktop.org/drm/misc/kernel.git
 +F:	Documentation/accel/amdxdna/
 +F:	drivers/accel/amdxdna/
 +F:	include/trace/events/amdxdna.h
 +F:	include/uapi/drm/amdxdna_accel.h
 +
  AMD XGBE DRIVER
  M:	"Shyam Sundar S K" <Shyam-sundar.S-k@amd.com>
  L:	netdev@vger.kernel.org