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

[Mark Brown]

Hi all,

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

  MAINTAINERS

between commit:

  a6e0072cfa82f ("MAINTAINERS: Update address for Ira Weiny")

from the nvdimm tree and commit:

  43ad501987391 ("MAINTAINERS: Add CXL reviewer")

from the cxl 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.

diff --cc MAINTAINERS
index ff2abbdaed574,158dc82dd3076..0000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -6505,8 -6431,9 +6505,9 @@@ M:	Jonathan Cameron <jic23@xxxxxxxxxx
  M:	Dave Jiang <dave.jiang@xxxxxxxxx>
  M:	Alison Schofield <alison.schofield@xxxxxxxxx>
  M:	Vishal Verma <vishal.l.verma@xxxxxxxxx>
 -M:	Ira Weiny <ira.weiny@xxxxxxxxx>
  M:	Dan Williams <djbw@xxxxxxxxxx>
 +R:	Ira Weiny <iweiny@xxxxxxxxxx>
+ R:	Li Ming <ming.li@xxxxxxxxxxxx>
  L:	linux-cxl@xxxxxxxxxxxxxxx
  S:	Maintained
  F:	Documentation/driver-api/cxl

Attachment: signature.asc
Description: PGP signature