lkml.org 
[lkml]   [2022]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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@canb.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.

\
 
 \ /
  Last update: 2022-05-10 18:57    [W:0.079 / U:0.564 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site