linux-next: manual merge of the drm-xe tree with the origin tree
Subsystems (3)
Mark Brown
maintainerHi 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.