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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 1 Aug 2024 11:26:50 +1000

Hi all,

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

  drivers/gpu/drm/xe/xe_vm.c

between commit:

  4c44f89c5dae ("drm/ttm, drm/amdgpu, drm/xe: Consider hitch moves within bulk sublist moves")

from the drm-misc tree and commit:

  a2387e69493d ("drm/xe: Take a ref to xe file when user creates a VM")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/xe/xe_vm.c
index c3bdb6362fe9,f225107bdd65..000000000000
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@@ -1604,7 -1670,10 +1673,11 @@@ static void vm_destroy_work_func(struc
  		XE_WARN_ON(vm->pt_root[id]);
  
  	trace_xe_vm_free(vm);
 +	ttm_lru_bulk_move_fini(&xe->ttm, &vm->lru_bulk_move);
+ 
+ 	if (vm->xef)
+ 		xe_file_put(vm->xef);
+ 
  	kfree(vm);
  }