Re: linux-next: manual merge of the akpm-current tree with the nvdimm tree

[Christoph Hellwig]

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.