Merge branch 'for-7.1/block-integrity'

Bring in the shared branch with the block layer.

* 'for-7.1/block-integrity' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/axboe/linux:
  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

Signed-off-by: Christian Brauner <brauner@kernel.org>

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

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