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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 22 Mar 2023 10:33:31 +1100

Hi all,

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

  mm/userfaultfd.c

between commit:

  a3b8390c1550 ("mm: userfaultfd: combine 'mode' and 'wp_copy' arguments")

from the mm tree and commit:

  74fd30bd28e4 ("mm: Make pte_mkwrite() take a VMA")

from the tip 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 mm/userfaultfd.c
index 7f1b5f8b712c,3db6f87c0aca..000000000000
--- a/mm/userfaultfd.c
+++ b/mm/userfaultfd.c
@@@ -76,8 -75,8 +76,8 @@@ int mfill_atomic_install_pte(pmd_t *dst
  	if (page_in_cache && !vm_shared)
  		writable = false;
  	if (writable)
- 		_dst_pte = pte_mkwrite(_dst_pte);
+ 		_dst_pte = pte_mkwrite(_dst_pte, dst_vma);
 -	if (wp_copy)
 +	if (flags & MFILL_ATOMIC_WP)
  		_dst_pte = pte_mkuffd_wp(_dst_pte);
  
  	dst_pte = pte_offset_map_lock(dst_mm, dst_pmd, dst_addr, &ptl);