linux-kernel - Re: linux-next: manual merge of the akpm tree with the mm-hotfixes 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 for Android: free password hash cracker in your pocket

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

Message-Id: <20220510095608.41b0f63a41a5e7f76c1fa187@linux-foundation.org>
Date:   Tue, 10 May 2022 09:56:08 -0700
From:   Andrew Morton <akpm@...ux-foundation.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Chengming Zhou <zhouchengming@...edance.com>,
        Joel Savitz <jsavitz@...hat.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the akpm tree with the mm-hotfixes
 tree

On Tue, 10 May 2022 22:35:30 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> Today's linux-next merge of the akpm tree got a conflict in:
> 
>   tools/testing/selftests/vm/Makefile
> 
> between commit:
> 
>   e33ebf536f3e ("selftests: vm: Makefile: rename TARGETS to VMTARGETS")
> 
> from the mm-hotfixes tree and patch:
> 
>   "kselftest/vm: override TARGETS from arguments"
> 
> from the akpm tree.

Thanks.  Let's just drop
kselftest-vm-override-targets-from-arguments.patch for now - a new
version is in the works.