linux-next: manual merge of the arm64 tree with the mm-hotfixes tree

linux-next: manual merge of the arm64 tree with the mm-hotfixes tree

[Stephen Rothwell]

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

Hi all,

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

  arch/arm64/include/asm/mman.h

between commit:

  5af5d93e04c1 ("mm: refactor arch_calc_vm_flag_bits() and arm64 MTE handling")

from the mm-hotfixes-unstable branch of the mm-hotfixes tree and commit:

  25c17c4b55de ("hugetlb: arm64: add mte support")

from the arm64 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/arm64/include/asm/mman.h
index 798d965760d4,1dbfb56cb313..000000000000
--- a/arch/arm64/include/asm/mman.h
+++ b/arch/arm64/include/asm/mman.h
@@@ -42,7 -39,7 +42,7 @@@ static inline unsigned long arch_calc_v
  	 * filesystem supporting MTE (RAM-based).
  	 */
  	if (system_supports_mte() &&
- 	    ((flags & MAP_ANONYMOUS) || shmem_file(file)))
 -	    (flags & (MAP_ANONYMOUS | MAP_HUGETLB)))
++	    ((flags & (MAP_ANONYMOUS | MAP_HUGETLB)) || shmem_file(file)))
  		return VM_MTE_ALLOWED;
  
  	return 0;

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

Re: linux-next: manual merge of the arm64 tree with the mm-hotfixes tree

[Catalin Marinas]

On Thu, Oct 31, 2024 at 10:42:47AM +1100, Stephen Rothwell wrote:
> diff --cc arch/arm64/include/asm/mman.h
> index 798d965760d4,1dbfb56cb313..000000000000
> --- a/arch/arm64/include/asm/mman.h
> +++ b/arch/arm64/include/asm/mman.h
> @@@ -42,7 -39,7 +42,7 @@@ static inline unsigned long arch_calc_v
>   	 * filesystem supporting MTE (RAM-based).
>   	 */
>   	if (system_supports_mte() &&
> - 	    ((flags & MAP_ANONYMOUS) || shmem_file(file)))
>  -	    (flags & (MAP_ANONYMOUS | MAP_HUGETLB)))
> ++	    ((flags & (MAP_ANONYMOUS | MAP_HUGETLB)) || shmem_file(file)))
>   		return VM_MTE_ALLOWED;
>   
>   	return 0;

Thanks Stephen. This looks fine.

-- 
Catalin