]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge drm/drm-next into drm-misc-next
authorMaxime Ripard <mripard@kernel.org>
Mon, 2 Dec 2024 11:44:18 +0000 (12:44 +0100)
committerMaxime Ripard <mripard@kernel.org>
Mon, 2 Dec 2024 11:44:18 +0000 (12:44 +0100)
Kickstart 6.14 cycle.

Signed-off-by: Maxime Ripard <mripard@kernel.org>
12 files changed:
1  2 
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
drivers/gpu/drm/mediatek/mtk_drm_drv.c
drivers/gpu/drm/msm/msm_drv.c
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c
drivers/gpu/drm/panthor/panthor_device.c
drivers/gpu/drm/panthor/panthor_mmu.c
drivers/gpu/drm/qxl/Kconfig
drivers/gpu/drm/radeon/radeon_drv.c
drivers/gpu/drm/tiny/bochs.c
drivers/gpu/drm/tiny/cirrus-qemu.c

diff --cc MAINTAINERS
index 713c1aa6b30612d4127af465aa1147dcb4a7da49,1e930c7a58b13d8bbe6bf133ba7b36aa24c2b5e0..d7292e0e5ae6771fc5f7ba6d95c0372086971f19
@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge