lkml.org 
[lkml]   [2021]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the akpm-current tree with the nvdimm tree
From
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.

\
 
 \ /
  Last update: 2021-12-07 11:24    [W:1.872 / U:1.400 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site