Merge branch 'for-4.4/integrity' into for-next

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

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

diff --cc block/blk.h
Simple merge

diff --cc drivers/nvme/host/pci.c
Simple merge

diff --cc drivers/scsi/sd.c
Simple merge

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