Subject: Re: linux-next: manual merge of the akpm tree with the mm-hotfixes tree

From: Andrew Morton <[email-masked]>
Date: Tue, 10 May 2022 09:56:08 -0700

On Tue, 10 May 2022 22:35:30 +1000 Stephen Rothwell <[email-masked]> 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.