]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge drm/drm-next into drm-xe-next
authorThomas Hellström <thomas.hellstrom@linux.intel.com>
Wed, 3 Dec 2025 10:22:18 +0000 (11:22 +0100)
committerThomas Hellström <thomas.hellstrom@linux.intel.com>
Wed, 3 Dec 2025 10:34:12 +0000 (11:34 +0100)
Backmerging to bring in a needed dependency for the Xe VFIO
driver variant. This should ideally have been done before we
commited that, so we now have a small window in drm-xe-next
where that driver doesn't compile.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202512030331.I8CveRre-lkp@intel.com/
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
1  2 
.mailmap
MAINTAINERS
drivers/gpu/drm/xe/Makefile
drivers/gpu/drm/xe/xe_bo.c
drivers/gpu/drm/xe/xe_device.c
drivers/gpu/drm/xe/xe_device_types.h
drivers/gpu/drm/xe/xe_exec_queue.c
drivers/gpu/drm/xe/xe_gt.c
drivers/gpu/drm/xe/xe_pci.c

diff --cc .mailmap
Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge