Re: linux-next: manual merge of the akpm-current tree with the arm64 tree

[Stephen Rothwell]

Hi all,

On Mon, 21 Sep 2020 18:03:53 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> 
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   arch/arm64/mm/mmu.c
> 
> between commit:
> 
>   0178dc761368 ("arm64: mte: Use Normal Tagged attributes for the linear map")
> 
> from the arm64 tree and commit:
> 
>   8e19cbb9528f ("arch, drivers: replace for_each_membock() with for_each_mem_range()")
> 
> from the akpm-current 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 arch/arm64/mm/mmu.c
> index 087a844b4d26,64211436629d..000000000000
> --- a/arch/arm64/mm/mmu.c
> +++ b/arch/arm64/mm/mmu.c
> @@@ -493,21 -483,10 +494,15 @@@ static void __init map_mem(pgd_t *pgdp
>   #endif
>   
>   	/* map all the memory banks */
> - 	for_each_memblock(memory, reg) {
> - 		phys_addr_t start = reg->base;
> - 		phys_addr_t end = start + reg->size;
> - 
> + 	for_each_mem_range(i, &start, &end) {
>   		if (start >= end)
>   			break;
> - 		if (memblock_is_nomap(reg))
> - 			continue;
> - 
>  -		__map_memblock(pgdp, start, end, PAGE_KERNEL, flags);
>  +		/*
>  +		 * The linear map must allow allocation tags reading/writing
>  +		 * if MTE is present. Otherwise, it has the same attributes as
>  +		 * PAGE_KERNEL.
>  +		 */
>  +		__map_memblock(pgdp, start, end, PAGE_KERNEL_TAGGED, flags);
>   	}
>   
>   	/*

This is now a conflict between the akpm-current tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpeK4kqGym4l.pgp
Description: OpenPGP digital signature