Hi all,

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

  drivers/gpu/drm/xe/xe_ggtt_types.h

between commit:

  d9a4a2021d4a5 ("Merge tag 'drm-misc-next-2026-03-12' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next")

from the drm tree and commit:

  7aaa8047eafd0 ("Linux 7.0-rc6")

from the drm-misc 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 --combined drivers/gpu/drm/xe/xe_ggtt_types.h
index 9af448cde3a1d,cf754e4d502ad..0000000000000
--- a/drivers/gpu/drm/xe/xe_ggtt_types.h
+++ b/drivers/gpu/drm/xe/xe_ggtt_types.h
@@@ -11,7 -11,6 +11,7 @@@
  
  struct xe_ggtt;
  struct xe_ggtt_node;
 +struct xe_gt;
  
  typedef void (*xe_ggtt_set_pte_fn)(struct xe_ggtt *ggtt, u64 addr, u64 pte);
  typedef void (*xe_ggtt_transform_cb)(struct xe_ggtt *ggtt,