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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 4 Oct 2022 21:00:29 +1100

Hi all,

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

  drivers/gpu/drm/amd/amdkfd/kfd_migrate.c

between commit:

  3a876060892b ("drm/amdkfd: Migrate in CPU page fault use current mm")

from the drm tree and commit:

  c5f45c35acc4 ("mm/memory.c: fix race when faulting a device private page")

from the mm 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/amd/amdkfd/kfd_migrate.c
index c70c026c9a93,97a684568ae0..000000000000
--- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
@@@ -949,11 -940,11 +951,12 @@@ static vm_fault_t svm_migrate_to_ram(st
  		goto out_unlock_prange;
  	}
  
 -	r = svm_migrate_vram_to_ram(prange, mm, KFD_MIGRATE_TRIGGER_PAGEFAULT_CPU,
 -				vmf->page);
 +	r = svm_migrate_vram_to_ram(prange, vmf->vma->vm_mm,
- 				    KFD_MIGRATE_TRIGGER_PAGEFAULT_CPU);
++				    KFD_MIGRATE_TRIGGER_PAGEFAULT_CPU,
++				    vmf->page);
  	if (r)
 -		pr_debug("failed %d migrate 0x%p [0x%lx 0x%lx] to ram\n", r,
 -			 prange, prange->start, prange->last);
 +		pr_debug("failed %d migrate svms 0x%p range 0x%p [0x%lx 0x%lx]\n",
 +			 r, prange->svms, prange, prange->start, prange->last);
  
  	/* xnack on, update mapping on GPUs with ACCESS_IN_PLACE */
  	if (p->xnack_enabled && parent == prange)