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

[Will Deacon]

On Fri, Oct 08, 2021 at 05:04:20PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   arch/arm64/kernel/mte.c
>   mm/kasan/kasan.h
>   mm/kasan/hw_tags.c
> 
> between commit:
> 
>   ec0288369f0c ("arm64: mte: Add asymmetric mode support")
> 
> from the arm64 tree and commit:
> 
>   7f3c6cb1e524 ("arm64: mte: add asymmetric mode support")
> 
> from the akpm-current tree.
> 
> I am assuming that the arm64 tree commit (and surrounding commits) is
> a newer version of the same change in the akpm-current tree, so I have
> dropped the following patches from the akpm-current tree.

Thanks, that's the right thing to do.

Will