linux-kernel - Re: linux-next: manual merge of the akpm-current tree with the nvdimm 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: <bc0baa2c-e747-b290-672d-619d7925753a@oracle.com>
Date:   Tue, 7 Dec 2021 10:23:48 +0000
From:   Joao Martins <joao.m.martins@...cle.com>
To:     Christoph Hellwig <hch@....de>,
        Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        Dan Williams <dan.j.williams@...el.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-current tree with the nvdimm
 tree

On 12/7/21 06:55, Christoph Hellwig wrote:
> On Tue, Dec 07, 2021 at 05:39:38PM +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the akpm-current tree got a conflict in:
>>
>>   mm/memremap.c
>>
>> between commit:
>>
>>   b80892ca022e ("memremap: remove support for external pgmap refcounts")
>>
>> from the nvdimm tree and commit:
>>
>>   30156644eb0d ("mm/memremap: add ZONE_DEVICE support for compound pages")
>>
>> from the akpm-current tree.
> 
> The resolution looks good to me, thanks.
> 
+1, the resolution looks good to me too.