From: Mark Brown <broonie@kernel.org>
To: Dan Williams <dan.j.williams@intel.com>,
Dave Jiang <dave.jiang@intel.com>
Cc: Ira Weiny <ira.weiny@intel.com>, John Groves <john@groves.net>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Smita Koralahalli <Smita.KoralahalliChannabasappa@amd.com>
Subject: linux-next: manual merge of the cxl tree with the nvdimm tree
Date: Wed, 1 Apr 2026 14:21:05 +0100 [thread overview]
Message-ID: <ac0bwb8BPmZ1_aoT@sirena.org.uk> (raw)
[-- 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 --]
reply other threads:[~2026-04-01 13:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=ac0bwb8BPmZ1_aoT@sirena.org.uk \
--to=broonie@kernel.org \
--cc=Smita.KoralahalliChannabasappa@amd.com \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=ira.weiny@intel.com \
--cc=john@groves.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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