Commit e4a55b55 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'libnvdimm-fixes-6.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm 

Pull libnvdimm fix from Ira Weiny:
 "Commit f467fee4 ("block: move the dax flag to queue_limits") broke
  the DAX tests by skipping over the legacy pmem mapping pages case.

  Set the DAX flag in this case as well"

* tag 'libnvdimm-fixes-6.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  nvdimm/pmem: Set dax flag for all 'PFN_MAP' cases
parents 60cb1da6 d5240fa6

drivers/nvdimm/pmem.c

+1 −1
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static int pmem_attach_disk(struct device *dev, 
	}

	if (fua)

		lim.features |= BLK_FEAT_FUA;

	if (is_nd_pfn(dev))

	if (is_nd_pfn(dev) || pmem_should_map_pages(dev))

		lim.features |= BLK_FEAT_DAX;



	if (!devm_request_mem_region(dev, res->start, resource_size(res),