Merge commit 382625d0 ("Merge tag 'for-5.9/block-20200802' of...

Merge commit 382625d0 ("Merge tag 'for-5.9/block-20200802' of git://git.kernel.dk/linux-block"

) into android-mainline

Conflicts:
	drivers/md/dm-bow.c
	drivers/md/dm-default-key.c
	drivers/md/dm.c
	fs/crypto/inline_crypt.c

Replace bdev->bd_queue with bdev_get_queue(bdev).

Bug: 129280212
Bug: 160883801
Bug: 160885805
Bug: 162257830
Change-Id: I9b0b295472080dfc0990dcb769205e68d706ce0e
Signed-off-by: Eric Biggers <ebiggers@google.com>