From: Ira Weiny <iweiny@fastmail•com>
To: Ira Weiny <iweiny@fastmail•com>, Mark Brown <broonie@kernel•org>,
Dan Williams <dan.j.williams@intel•com>,
Dave Jiang <dave.jiang@intel•com>
Cc: Alison Schofield <alison.schofield@intel•com>,
Ira Weiny <ira.weiny@intel•com>, Ira Weiny <iweiny@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the cxl tree with the nvdimm tree
Date: Tue, 2 Jun 2026 15:02:43 -0500 [thread overview]
Message-ID: <6a1f36e3c234b_5020c1007d@xwing.notmuch> (raw)
In-Reply-To: <6a1f36341a07b_4fbf910098@xwing.notmuch>
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
>
>
next prev parent reply other threads:[~2026-06-02 20:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-02 16:34 linux-next: manual merge of the cxl tree with the nvdimm tree Mark Brown
2026-06-02 19:59 ` Ira Weiny
2026-06-02 20:02 ` Ira Weiny [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-04-01 13:21 Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6a1f36e3c234b_5020c1007d@xwing.notmuch \
--to=iweiny@fastmail$(echo .)com \
--cc=alison.schofield@intel$(echo .)com \
--cc=broonie@kernel$(echo .)org \
--cc=dan.j.williams@intel$(echo .)com \
--cc=dave.jiang@intel$(echo .)com \
--cc=ira.weiny@intel$(echo .)com \
--cc=iweiny@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox