Date:   Tue, 7 Dec 2021 07:55:56 +0100
From:   Christoph Hellwig <hch@lst.de>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Andrew Morton <akpm@linux-foundation.org>,
        Dan Williams <dan.j.williams@intel.com>,
        Christoph Hellwig <hch@lst.de>,
        Joao Martins <joao.m.martins@oracle.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 nvdimm tree
Message-ID: <20211207065556.GA4786@lst.de>
References: <20211207173938.6d619ba6@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20211207173938.6d619ba6@canb.auug.org.au>
User-Agent: Mutt/1.5.17 (2007-11-01)
Precedence: bulk

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.