Skip to contentSkip to conversation

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

PATCH Mark Brown 1 participant 1 message Sep 15, 2025

Subsystems (3)
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

Hi all,

Today's linux-next merge of the drm-xe tree got conflicts in:

drivers/gpu/drm/xe/tests/xe_bo.c
drivers/gpu/drm/xe/xe_bo.c
drivers/gpu/drm/xe/xe_bo.h
drivers/gpu/drm/xe/xe_dma_buf.c
drivers/gpu/drm/xe/xe_exec.c
drivers/gpu/drm/xe/xe_vm.c

between commit:

5c87fee3c96ce ("drm/xe: Attempt to bring bos back to VRAM after eviction")

from the origin tree and commits:

cb3d7b3b46b79 ("drm/xe: Attempt to bring bos back to VRAM after eviction") 0131514f97890 ("drm/xe: Pass down drm_exec context to validation") 8f25e5abcbfb9 ("drm/xe: Convert existing drm_exec transactions for exhaustive eviction")

from the drm-xe 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.

drivers/gpu/drm/xe/tests/xe_bo.c +0 -0
diff --cc drivers/gpu/drm/xe/tests/xe_bo.c
index 7b40cc8be1c9c,2294cf89f3e11..0000000000000
drivers/gpu/drm/xe/xe_bo.c +0 -0
diff --cc drivers/gpu/drm/xe/xe_bo.c
index 870f433472811,8422f3cab1139..0000000000000
drivers/gpu/drm/xe/xe_bo.h +0 -0
diff --cc drivers/gpu/drm/xe/xe_bo.h
index cfb1ec266a6da,a77af42b5f9ea..0000000000000
drivers/gpu/drm/xe/xe_dma_buf.c +0 -0
diff --cc drivers/gpu/drm/xe/xe_dma_buf.c
index 95d06bd65b0f1,607c3f4ef3b92..0000000000000
drivers/gpu/drm/xe/xe_exec.c +0 -0
diff --cc drivers/gpu/drm/xe/xe_exec.c
index 374c831e691b2,7715e74bb9454..0000000000000
drivers/gpu/drm/xe/xe_vm.c +0 -0
diff --cc drivers/gpu/drm/xe/xe_vm.c
index c00a5ff318176,0cacab20ff852..0000000000000