Merge branch 'for-4.5/block-dax' into for-4.5/libnvdimm

diff --cc drivers/nvdimm/nd-core.h
Simple merge

diff --cc drivers/nvdimm/nd.h
index e4e9f9ae0cc886e320528850c66674a6fc259ec3,288d96ec72336943cd3b6125933f8c5e75461385..ba1633b9da31fb2491101708cf105a765ec29bb4
--- 1/drivers/nvdimm/nd.h
--- 2/drivers/nvdimm/nd.h
+++ b/drivers/nvdimm/nd.h
@@@ -29,8 -29,21 +29,14 @@@ enum 
        ND_MAX_LANES = 256,
        SECTOR_SHIFT = 9,
        INT_LBASIZE_ALIGNMENT = 64,
 -#if IS_ENABLED(CONFIG_NVDIMM_PFN)
 -      ND_PFN_ALIGN = PAGES_PER_SECTION * PAGE_SIZE,
 -      ND_PFN_MASK = ND_PFN_ALIGN - 1,
 -#else
 -      ND_PFN_ALIGN = 0,
 -      ND_PFN_MASK = 0,
 -#endif
  };
  
+ struct nd_poison {
+       u64 start;
+       u64 length;
+       struct list_head list;
+ };
+ 
  struct nvdimm_drvdata {
        struct device *dev;
        int nsindex_size;

diff --cc drivers/nvdimm/pmem.c
Simple merge