* linux-next: manual merge of the cxl tree with the nvdimm tree
@ 2026-04-01 13:21 Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2026-04-01 13:21 UTC (permalink / raw)
To: Dan Williams, Dave Jiang
Cc: Ira Weiny, John Groves, Linux Kernel Mailing List,
Linux Next Mailing List, Smita Koralahalli
[-- Attachment #1: Type: text/plain, Size: 1016 bytes --]
Hi all,
Today's linux-next merge of the cxl tree got a conflict in:
drivers/dax/Makefile
between commit:
d5406bd458b0a ("dax: add fsdev.c driver for fs-dax on character dax")
from the nvdimm tree and commit:
39aa1d4be12bf ("dax/cxl, hmem: Initialize hmem early and defer dax_cxl binding")
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 drivers/dax/Makefile
index ba35bda7abefe,70e996bf15261..0000000000000
--- a/drivers/dax/Makefile
+++ b/drivers/dax/Makefile
@@@ -11,6 -11,3 +12,4 @@@ dax-y += bus.
device_dax-y := device.o
dax_pmem-y := pmem.o
dax_cxl-y := cxl.o
+fsdev_dax-y := fsdev.o
-
- obj-y += hmem/
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* linux-next: manual merge of the cxl tree with the nvdimm tree
@ 2026-06-02 16:34 Mark Brown
2026-06-02 19:59 ` Ira Weiny
0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2026-06-02 16:34 UTC (permalink / raw)
To: Dan Williams, Dave Jiang
Cc: Alison Schofield, Ira Weiny, Ira Weiny, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]
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@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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the cxl tree with the nvdimm tree
2026-06-02 16:34 Mark Brown
@ 2026-06-02 19:59 ` Ira Weiny
2026-06-02 20:02 ` Ira Weiny
0 siblings, 1 reply; 4+ messages in thread
From: Ira Weiny @ 2026-06-02 19:59 UTC (permalink / raw)
To: Mark Brown, Dan Williams, Dave Jiang
Cc: Alison Schofield, Ira Weiny, Ira Weiny, Linux Kernel Mailing List,
Linux Next Mailing List
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>
>
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the cxl tree with the nvdimm tree
2026-06-02 19:59 ` Ira Weiny
@ 2026-06-02 20:02 ` Ira Weiny
0 siblings, 0 replies; 4+ messages in thread
From: Ira Weiny @ 2026-06-02 20:02 UTC (permalink / raw)
To: Ira Weiny, Mark Brown, Dan Williams, Dave Jiang
Cc: Alison Schofield, Ira Weiny, Ira Weiny, Linux Kernel Mailing List,
Linux Next Mailing List
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
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-06-02 20:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-04-01 13:21 linux-next: manual merge of the cxl tree with the nvdimm tree Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2026-06-02 16:34 Mark Brown
2026-06-02 19:59 ` Ira Weiny
2026-06-02 20:02 ` Ira Weiny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox