linux-next: manual merge of the xarray tree with the nvdimm tree

linux-next: manual merge of the xarray tree with the nvdimm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1279 bytes --]

Hi Matthew,

Today's linux-next merge of the xarray tree got a conflict in:

  MAINTAINERS

between commits:

  30153e5ba54d ("MAINTAINERS: update Ross Zwisler's email address")
  212a28b4dae9 ("MAINTAINERS: Add Jan Kara for filesystem DAX")

from the nvdimm tree and commit:

  40c8f8eed61c ("Update email address")

from the xarray tree.

I fixed it up (see below) 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.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 7afb9ad5a85c,9bcfd5caa248..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4330,9 -4272,8 +4330,9 @@@ S:	Maintaine
  F:	drivers/i2c/busses/i2c-diolan-u2c.c
  
  FILESYSTEM DIRECT ACCESS (DAX)
- M:	Matthew Wilcox <mawilcox@microsoft.com>
+ M:	Matthew Wilcox <willy@infradead.org>
 -M:	Ross Zwisler <ross.zwisler@linux.intel.com>
 +M:	Ross Zwisler <zwisler@kernel.org>
 +M:	Jan Kara <jack@suse.cz>
  L:	linux-fsdevel@vger.kernel.org
  S:	Supported
  F:	fs/dax.c

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the xarray tree with the nvdimm tree

[Stephen Rothwell]

[-- 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 --]

linux-next: manual merge of the xarray tree with the nvdimm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 542 bytes --]

Hi all,

Today's linux-next merge of the xarray tree got a conflict in:

  fs/dax.c

between commit:

  55f25ced654c ("filesystem-dax: Introduce dax_lock_mapping_entry()")

from the nvdimm tree and several commits from the xarray tree.

I have no idea how to fix this up, please discuss it and give me a
resolution (or better yet, create a command branch that both trees can
merge so that the conflicts do not exist any more).

I have temporarily dropped the xarray and ida trees for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]