Hi all,

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

  mm/migrate.c

between commit:

  c33c794828f2 ("mm: ptep_get() conversion")

from the mm-stable tree and commit:

  23a219c1860b ("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/migrate.c
index 6f4066425d47,8b46b722f1a4..000000000000
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@@ -220,8 -219,8 +220,8 @@@ static bool remove_migration_pte(struc
  		if (folio_test_dirty(folio) && is_migration_entry_dirty(entry))
  			pte = pte_mkdirty(pte);
  		if (is_writable_migration_entry(entry))
- 			pte = pte_mkwrite(pte);
+ 			pte = pte_mkwrite(pte, vma);
 -		else if (pte_swp_uffd_wp(*pvmw.pte))
 +		else if (pte_swp_uffd_wp(old_pte))
  			pte = pte_mkuffd_wp(pte);
  
  		if (folio_test_anon(folio) && !is_readable_migration_entry(entry))

Hi all,

On Thu, 22 Jun 2023 13:16:09 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   mm/migrate.c
> 
> between commit:
> 
>   c33c794828f2 ("mm: ptep_get() conversion")
> 
> from the mm-stable tree and commit:
> 
>   23a219c1860b ("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.
> 
> diff --cc mm/migrate.c
> index 6f4066425d47,8b46b722f1a4..000000000000
> --- a/mm/migrate.c
> +++ b/mm/migrate.c
> @@@ -220,8 -219,8 +220,8 @@@ static bool remove_migration_pte(struc
>   		if (folio_test_dirty(folio) && is_migration_entry_dirty(entry))
>   			pte = pte_mkdirty(pte);
>   		if (is_writable_migration_entry(entry))
> - 			pte = pte_mkwrite(pte);
> + 			pte = pte_mkwrite(pte, vma);
>  -		else if (pte_swp_uffd_wp(*pvmw.pte))
>  +		else if (pte_swp_uffd_wp(old_pte))
>   			pte = pte_mkuffd_wp(pte);
>   
>   		if (folio_test_anon(folio) && !is_readable_migration_entry(entry))

This is now a conflict between the tip tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell