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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1266 bytes --]

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))

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1488 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]

Hi all,

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

  arch/s390/Kconfig

between commit:

  7e6ebd8ee418 ("mm/vmemmap optimization: split hugetlb and devdax vmemmap optimization")

from the mm-stable tree and commit:

  2f0584f3f4bd ("mm: Rename arch pte_mkwrite()'s to pte_mkwrite_novma()")

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 arch/s390/Kconfig
index 661b6de69c27,91514d535c46..000000000000
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -127,7 -127,8 +127,8 @@@ config S39
  	select ARCH_WANTS_NO_INSTR
  	select ARCH_WANT_DEFAULT_BPF_JIT
  	select ARCH_WANT_IPC_PARSE_VERSION
 -	select ARCH_WANT_OPTIMIZE_VMEMMAP
 +	select ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP
+ 	select ARCH_WANT_KERNEL_PMD_MKWRITE
  	select BUILDTIME_TABLE_SORT
  	select CLONE_BACKWARDS2
  	select DMA_OPS if PCI

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]