Merge branch 'for-7.1/block-integrity' into for-7.1/block

Merge in integrity changes which are also landing in the VFS tree as
dependencies for fs related changes.

* for-7.1/block-integrity:
  block: pass a maxlen argument to bio_iov_iter_bounce
  block: add fs_bio_integrity helpers
  block: make max_integrity_io_size public
  block: prepare generation / verification helpers for fs usage
  block: add a bdev_has_integrity_csum helper
  block: factor out a bio_integrity_setup_default helper
  block: factor out a bio_integrity_action helper

diff --cc block/bio.c
Simple merge

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

diff --cc fs/iomap/direct-io.c
Simple merge

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