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

[Mark Brown]

Hi all,

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

  mm/migrate_device.c

between commit:

  1de80c790c979 ("mm/migrate_device: remove dead migration entry check in migrate_vma_collect_huge_pmd()")

from the mm-unstable tree and commit:

  a69d1ab971a62 ("mm: Fix a hmm_range_fault() livelock / starvation problem")

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.

diff --combined mm/migrate_device.c
index 78c7acf024615,deab89fd45419..0000000000000
--- a/mm/migrate_device.c
+++ b/mm/migrate_device.c
@@@ -175,6 -175,12 +175,6 @@@ static int migrate_vma_collect_huge_pmd
  			return migrate_vma_collect_skip(start, end, walk);
  		}
  
 -		if (softleaf_is_migration(entry)) {
 -			softleaf_entry_wait_on_locked(entry, ptl);
 -			spin_unlock(ptl);
 -			return -EAGAIN;
 -		}
 -
  		if (softleaf_is_device_private_write(entry))
  			write = MIGRATE_PFN_WRITE;
  	} else {
@@@ -265,7 -271,7 +265,7 @@@ again
  	ptep = pte_offset_map_lock(mm, pmdp, start, &ptl);
  	if (!ptep)
  		goto again;
 -	arch_enter_lazy_mmu_mode();
 +	lazy_mmu_mode_enable();
  	ptep += (addr - start) / PAGE_SIZE;
  
  	for (; addr < end; addr += PAGE_SIZE, ptep++) {
@@@ -307,7 -313,7 +307,7 @@@
  			if (folio_test_large(folio)) {
  				int ret;
  
 -				arch_leave_lazy_mmu_mode();
 +				lazy_mmu_mode_disable();
  				pte_unmap_unlock(ptep, ptl);
  				ret = migrate_vma_split_folio(folio,
  							  migrate->fault_page);
@@@ -350,7 -356,7 +350,7 @@@
  			if (folio && folio_test_large(folio)) {
  				int ret;
  
 -				arch_leave_lazy_mmu_mode();
 +				lazy_mmu_mode_disable();
  				pte_unmap_unlock(ptep, ptl);
  				ret = migrate_vma_split_folio(folio,
  							  migrate->fault_page);
@@@ -479,7 -485,7 +479,7 @@@ next
  	if (unmapped)
  		flush_tlb_range(walk->vma, start, end);
  
 -	arch_leave_lazy_mmu_mode();
 +	lazy_mmu_mode_disable();
  	pte_unmap_unlock(ptep - 1, ptl);
  
  	return 0;
@@@ -1413,10 -1419,10 +1413,10 @@@ EXPORT_SYMBOL(migrate_device_range)
  
  /**
   * migrate_device_pfns() - migrate device private pfns to normal memory.
 - * @src_pfns: pre-popluated array of source device private pfns to migrate.
 + * @src_pfns: pre-populated array of source device private pfns to migrate.
   * @npages: number of pages to migrate.
   *
 - * Similar to migrate_device_range() but supports non-contiguous pre-popluated
 + * Similar to migrate_device_range() but supports non-contiguous pre-populated
   * array of device pages to migrate.
   */
  int migrate_device_pfns(unsigned long *src_pfns, unsigned long npages)

Attachment: signature.asc
Description: PGP signature