Merge branch 'for-4.17/dax' into libnvdimm-for-next

This commit is contained in:
Dan Williams 2018-04-09 10:50:17 -07:00
commit e13e75b86e
60 changed files with 1637 additions and 1298 deletions

View file

@ -20,7 +20,7 @@ if LIBNVDIMM
config BLK_DEV_PMEM
tristate "PMEM: Persistent memory block device support"
default LIBNVDIMM
select DAX
select DAX_DRIVER
select ND_BTT if BTT
select ND_PFN if NVDIMM_PFN
help