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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/acpi/nfit/core.c
Simple merge

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

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

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

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

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

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

diff --cc drivers/nvdimm/pmem.c
index 4a9cffc14512906294a674967a699542bd4761d1,e7a40f77f7299379b1b96388bbf74d21b4a5e316..e0f6d83c5a6eac5f963db8ee55a7b69a80d59422
--- 1/drivers/nvdimm/pmem.c
--- 2/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@@ -68,11 -68,9 +68,11 @@@ static int pmem_clear_poison(struct pme
                                (unsigned long long) sector, cleared,
                                cleared > 1 ? "s" : "");
                badblocks_clear(&pmem->bb, sector, cleared);
 +              if (pmem->bb_state)
 +                      sysfs_notify_dirent(pmem->bb_state);
        }
  
-       invalidate_pmem(pmem->virt_addr + offset, len);
+       arch_invalidate_pmem(pmem->virt_addr + offset, len);
  
        return rc;
  }
@@@ -341,10 -363,9 +365,10 @@@ static int pmem_attach_disk(struct devi
                return PTR_ERR(addr);
        pmem->virt_addr = addr;
  
-       blk_queue_write_cache(q, true, true);
+       blk_queue_write_cache(q, wbc, fua);
        blk_queue_make_request(q, pmem_make_request);
        blk_queue_physical_block_size(q, PAGE_SIZE);
 +      blk_queue_logical_block_size(q, pmem_sector_size(ndns));
        blk_queue_max_hw_sectors(q, UINT_MAX);
        blk_queue_bounce_limit(q, BLK_BOUNCE_ANY);
        queue_flag_set_unlocked(QUEUE_FLAG_NONROT, q);

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

diff --cc drivers/nvdimm/region_devs.c
index ab141f8b51403dbb90a9762ae645cae1f114d899,0c3b089b280a9d8cf114381fdd80e0b0249599b7..5954cfbea3fce58d14fac6ea7f5900791eaaa38d
--- 1/drivers/nvdimm/region_devs.c
--- 2/drivers/nvdimm/region_devs.c
+++ b/drivers/nvdimm/region_devs.c
@@@ -307,9 -311,8 +311,9 @@@ static ssize_t set_cookie_show(struct d
  {
        struct nd_region *nd_region = to_nd_region(dev);
        struct nd_interleave_set *nd_set = nd_region->nd_set;
 +      ssize_t rc = 0;
  
-       if (is_nd_pmem(dev) && nd_set)
+       if (is_memory(dev) && nd_set)
                /* pass, should be precluded by region_visible */;
        else
                return -ENXIO;

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