Re: [External] Re: linux-next: manual merge of the akpm tree with the mm-hotfixes tree

[Chengming Zhou]

On 2022/5/11 06:35, Stephen Rothwell wrote:
> Hi Andrew,
> 
> On Tue, 10 May 2022 09:56:08 -0700 Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote:
>>
>> On Tue, 10 May 2022 22:35:30 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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.
> 
> OK, done.
> 

I just pulled akpm and linux-next tree, saw that you have fixed the conflict
in the commit 526a655c5849 ("kselftest/vm: override TARGETS from arguments").

It looks good to me, so I should have nothing to do.

Thanks.