linux-next: manual merge of the drm tree with the origin tree

Mark Brown <[email protected]> Mon, 20 Jul 2026 15:44:14 +0100

Newsgroups	org.kernel.vger.linux-next,org.freedesktop.lists.dri-devel,org.kernel.vger.linux-kernel
Message-ID	<[email protected]>

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/xe/xe_device.c

between commit:

  130910bac905a ("drm/xe/pf: Disable display in admin only PF mode")

from the origin tree and commit:

  21fcb222f0d1e ("drm: Remove DRIVER_GEM_GPUVA feature flag")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/gpu/drm/xe/xe_device.c
index 9d119c95a569a,ad7f3e61d4579..0000000000000
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@@ -426,7 -427,8 +427,7 @@@ static const struct drm_ioctl_desc xe_i
  
  static const struct drm_driver admin_only_driver = {
  	.driver_features =
- 	    DRIVER_GEM | DRIVER_RENDER | DRIVER_GEM_GPUVA,
 -	    XE_DISPLAY_DRIVER_FEATURES |
+ 	    DRIVER_GEM | DRIVER_RENDER,
  	.open = xe_file_open,
  	.postclose = xe_file_close,
  	.ioctls = xe_ioctls_admin_only,

signature.asc (application/pgp-signature, 488 B)