From: Linus Torvalds Date: Tue, 21 Apr 2026 21:12:01 +0000 (-0700) Subject: Merge tag 'libnvdimm-for-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm... X-Git-Tag: v7.1-rc1~55 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=bb0bc49a1cef574646eb25d74709c5ff200903a8;p=thirdparty%2Flinux.git Merge tag 'libnvdimm-for-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm Pull dax updates from Ira Weiny: "The series adds DAX support required for the upcoming fuse/famfs file system.[1] The support here is required because famfs is backed by devdax rather than pmem. This all lays the groundwork for using shared memory as a file system" Link: https://lore.kernel.org/all/0100019d43e5f632-f5862a3e-361c-4b54-a9a6-96c242a8f17a-000000@email.amazonses.com/ [1] * tag 'libnvdimm-for-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: dax/fsdev: fix uninitialized kaddr in fsdev_dax_zero_page_range() dax: export dax_dev_get() dax: Add fs_dax_get() func to prepare dax for fs-dax usage dax: Add dax_set_ops() for setting dax_operations at bind time dax: Add dax_operations for use by fs-dax on fsdev dax dax: Save the kva from memremap dax: add fsdev.c driver for fs-dax on character dax dax: Factor out dax_folio_reset_order() helper dax: move dax_pgoff_to_phys from [drivers/dax/] device.c to bus.c --- bb0bc49a1cef574646eb25d74709c5ff200903a8 diff --cc drivers/dax/Makefile index 70e996bf15261,ba35bda7abefe..c0bc6eb1ea20a --- a/drivers/dax/Makefile +++ b/drivers/dax/Makefile @@@ -11,3 -11,6 +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/