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:
pgpv4M7DkWWAj.pgp
Description: OpenPGP digital signature
