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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20211008073711.GC32625@willie-the-truck>
Date:   Fri, 8 Oct 2021 08:37:12 +0100
From:   Will Deacon <will@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        Catalin Marinas <catalin.marinas@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Vincenzo Frascino <vincenzo.frascino@....com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the arm64
 tree

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