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
Date: Tue, 7 Dec 2021 07:55:56 +0100 [thread overview]
Message-ID: <20211207065556.GA4786@lst.de> (raw)
In-Reply-To: <20211207173938.6d619ba6@canb.auug.org.au>
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.
next prev parent reply other threads:[~2021-12-07 6:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-07 6:39 linux-next: manual merge of the akpm-current tree with the nvdimm tree Stephen Rothwell
2021-12-07 6:55 ` Christoph Hellwig [this message]
2021-12-07 10:23 ` Joao Martins
-- strict thread matches above, loose matches on Subject: below --
2018-06-04 10:24 Stephen Rothwell
2017-11-16 3:16 Stephen Rothwell
2017-11-16 4:55 ` Minchan Kim
2017-04-24 6:47 Stephen Rothwell
2016-01-08 5:51 Stephen Rothwell
2015-12-31 10:51 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211207065556.GA4786@lst.de \
--to=hch@lst.de \
--cc=akpm@linux-foundation.org \
--cc=dan.j.williams@intel.com \
--cc=joao.m.martins@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.