Merge tag 'libnvdimm-for-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/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/
* 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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/dax/Kconfig
Simple merge

diff --cc drivers/dax/Makefile
index 70e996bf152617e0fa580aa089fb11eef36888a9,ba35bda7abefed153b7f822bde96eeaa641f0f68..c0bc6eb1ea20ab536cb69d79326c7a4e83d82a5c
--- 1/drivers/dax/Makefile
--- 2/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
 -
 -obj-y += hmem/
+ fsdev_dax-y := fsdev.o

diff --cc drivers/dax/bus.c
Simple merge

diff --cc drivers/dax/bus.h
Simple merge

diff --cc drivers/dax/device.c
Simple merge

diff --cc fs/dax.c
Simple merge

diff --cc include/linux/dax.h
Simple merge