Merge commit 750a02ab ("Merge tag 'for-5.8/block-2020-06-01' of...

Merge commit 750a02ab ("Merge tag 'for-5.8/block-2020-06-01' of git://git.kernel.dk/linux-block"

) into android-mainline

Conflicts:
	block/blk-core.c
	block/blk-crypto-fallback.c
	block/blk-crypto.c
	block/keyslot-manager.c
	drivers/md/dm.c
	include/linux/blk-crypto.h
	include/linux/blk_types.h
	include/linux/keyslot-manager.h

Change-Id: Ie757c41fa41e6a9aacdf123d82d4f681623a02a8
Signed-off-by: Eric Biggers <ebiggers@google.com>