Merge branch 'for-4.11/libnvdimm' into for-4.12/dax

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/dax/dax.c
index e5f85550dc2547b28784e1a6aa69bddadd2456fd,806f180c80d816b313319f960479a7ad2848c672..19795eb35579bae72617377b07e91abbabff30e4
--- 1/drivers/dax/dax.c
--- 2/drivers/dax/dax.c
+++ b/drivers/dax/dax.c
@@@ -685,19 -718,10 +713,19 @@@ static void kill_dax_dev(struct dax_de
         * upon seeing dax_dev->alive == false.
         */
        dax_dev->alive = false;
-       synchronize_rcu();
+       synchronize_srcu(&dax_srcu);
        unmap_mapping_range(dax_dev->inode->i_mapping, 0, 0, 1);
 -      cdev_del(cdev);
 -      device_unregister(dev);
 +}
 +
 +static void unregister_dax_dev(void *dev)
 +{
 +      struct dax_dev *dax_dev = to_dax_dev(dev);
 +
 +      dev_dbg(dev, "%s\n", __func__);
 +
 +      kill_dax_dev(dax_dev);
 +      cdev_device_del(&dax_dev->cdev, dev);
 +      put_device(dev);
  }
  
  struct dax_dev *devm_create_dax_dev(struct dax_region *dax_region,

diff --cc drivers/hv/channel.c
Simple merge

diff --cc drivers/hv/channel_mgmt.c
Simple merge

diff --cc drivers/hv/hv_fcopy.c
Simple merge

diff --cc drivers/hv/hv_kvp.c
Simple merge

diff --cc drivers/hv/hv_snapshot.c
Simple merge

diff --cc drivers/hv/vmbus_drv.c
Simple merge

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