linux-kernel - Re: [External] 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <41a1d78a-3446-0c94-ed8a-0c383a2c010e@bytedance.com>
Date:   Wed, 11 May 2022 10:38:54 +0800
From:   Chengming Zhou <zhouchengming@...edance.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Andrew Morton <akpm@...ux-foundation.org>
Cc:     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: [External] Re: linux-next: manual merge of the akpm tree with the
 mm-hotfixes tree

On 2022/5/11 06:35, Stephen Rothwell wrote:
> Hi Andrew,
> 
> On Tue, 10 May 2022 09:56:08 -0700 Andrew Morton <akpm@...ux-foundation.org> wrote:
>>
>> 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.
> 
> 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.