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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 23 Jul 2018 16:51:34 +1000

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 <[email-masked]>
+ M:	Matthew Wilcox <[email-masked]>
 -M:	Ross Zwisler <[email-masked]>
 +M:	Ross Zwisler <[email-masked]>
 +M:	Jan Kara <[email-masked]>
  L:	[email-masked]
  S:	Supported
  F:	fs/dax.c