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

[Ira Weiny <iweiny@fastmail.com>]

Ira Weiny wrote:
> Mark Brown wrote:
> > 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.
> 
> LGTM:
> 
> Reviewed-by: Ira Weiny <ira.weiny@intel.com>

oops...  Best to match the email with the one I'm replying too.  Old
habits...

Reviewed-by: Ira Weiny <iweiny@kernel.org>

> 
> >
> > 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@kernel.org
> >   M:	Dave Jiang <dave.jiang@intel.com>
> >   M:	Alison Schofield <alison.schofield@intel.com>
> >   M:	Vishal Verma <vishal.l.verma@intel.com>
> >  -M:	Ira Weiny <ira.weiny@intel.com>
> >   M:	Dan Williams <djbw@kernel.org>
> >  +R:	Ira Weiny <iweiny@kernel.org>
> > + R:	Li Ming <ming.li@zohomail.com>
> >   L:	linux-cxl@vger.kernel.org
> >   S:	Maintained
> >   F:	Documentation/driver-api/cxl
> 
>