Merge branch 'for-4.4/integrity' of git://git.kernel.dk/linux-block

Pull block integrity updates from Jens Axboe:
 ""This is the joint work of Dan and Martin, cleaning up and improving
  the support for block data integrity"

* 'for-4.4/integrity' of git://git.kernel.dk/linux-block:
  block, libnvdimm, nvme: provide a built-in blk_integrity nop profile
  block: blk_flush_integrity() for bio-based drivers
  block: move blk_integrity to request_queue
  block: generic request_queue reference counting
  nvme: suspend i/o during runtime blk_integrity_unregister
  md: suspend i/o during runtime blk_integrity_unregister
  md, dm, scsi, nvme, libnvdimm: drop blk_integrity_unregister() at shutdown
  block: Inline blk_integrity in struct gendisk
  block: Export integrity data interval size in sysfs
  block: Reduce the size of struct blk_integrity
  block: Consolidate static integrity profile properties
  block: Move integrity kobject to struct gendisk

diff --cc block/blk-core.c
Simple merge

diff --cc block/blk-mq.c
Simple merge

diff --cc block/blk-sysfs.c
Simple merge

diff --cc block/blk.h
Simple merge

diff --cc drivers/md/dm.c
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/md/raid1.c
Simple merge

diff --cc drivers/md/raid10.c
Simple merge

diff --cc drivers/nvme/host/pci.c
index 6c0d0fecaeb3acfef876b887e28771c1a0dc8b6e,9bea542afc4f72f65d2d2d6e0f4d233b70db0446..381d2a0aa4615222a6b00c6f5eca6361a5fb0ed6
--- 1/drivers/nvme/host/pci.c
--- 2/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@@ -2061,13 -2029,10 +2046,12 @@@ static int nvme_revalidate_disk(struct 
        ns->pi_type = pi_type;
        blk_queue_logical_block_size(ns->queue, bs);
  
-       if (ns->ms && !blk_get_integrity(disk) && (disk->flags & GENHD_FL_UP) &&
-                                                               !ns->ext)
+       if (ns->ms && !ns->ext)
                nvme_init_integrity(ns);
  
 -      if (ns->ms && !(ns->ms == 8 && ns->pi_type) && !blk_get_integrity(disk))
 +      if ((ns->ms && !(ns->ms == 8 && ns->pi_type) &&
 +                                              !blk_get_integrity(disk)) ||
 +                                              ns->type == NVME_NS_LIGHTNVM)
                set_capacity(disk, 0);
        else
                set_capacity(disk, le64_to_cpup(&id->nsze) << (ns->lba_shift - 9));