tree 46ad2d22dd4af60634fc8e5e2f9980e3af1eb7f2
parent effa04cc5a31b3f12cda6025ab93460f1f0e454e
parent 4125a09b0a0d579ebace17f0e62b03ab9d5ab2f4
author Linus Torvalds <torvalds@linux-foundation.org> 1446699108 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1446699108 -0800

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