From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Matthew Wilcox <willy@infradead.org>,
Dan Williams <dan.j.williams@intel.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Dave Jiang <dave.jiang@intel.com>
Subject: linux-next: manual merge of the xarray tree with the nvdimm tree
Date: Tue, 21 Aug 2018 11:49:24 +1000 [thread overview]
Message-ID: <20180821114924.0133d568@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 940 bytes --]
Hi Matthew,
Today's linux-next merge of the xarray tree got a conflict in:
mm/memory-failure.c
between commit:
6100e34b2526 ("mm, memory_failure: Teach memory_failure() about dev_pagemap pages")
from the nvdimm tree and commit:
0c2b437d7e2b ("mm, memory_failure: Teach memory_failure() about dev_pagemap pages")
from the xarray tree.
I fixed it up (the former looks like an updated version (after Linus'
"review", so I used that version) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
I guess the xarray tree needs to be rebased on the changes in the
nvdimm tree. :-(
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-08-21 1:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-21 1:49 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-07-23 7:17 linux-next: manual merge of the xarray tree with the nvdimm tree Stephen Rothwell
2018-07-23 6: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=20180821114924.0133d568@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=willy@infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).