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

[Will Deacon]

On Mon, Jun 07, 2021 at 07:25:13PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   arch/arm64/include/asm/page.h
> 
> between commits:
> 
>   92638b4e1b47 ("mm: arch: remove indirection level in alloc_zeroed_user_highpage_movable()")
>   7a3b83537188 ("kasan: use separate (un)poison implementation for integrated init")
>   013bb59dbb7c ("arm64: mte: handle tags zeroing at page allocation time")
>   c275c5c6d50a ("kasan: disable freed user page poisoning with HW tags")
> 
> from the arm64 tree and (more or less) duplicated patches in the akpm tree.
> 
> I fixed it up (I dropped the patches form the akpm tree) 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.

Thanks, Stephen.

Andrew -- you can drop your copies of these patches, as you suggested at:

https://lore.kernel.org/r/20210603200308.2a08d25db0dc92430a545b4c@xxxxxxxxxxxxxxxxxxxx

Will