Merge 3ad11d7a ("Merge tag 'block-5.10-2020-10-12' of...

Merge 3ad11d7a ("Merge tag 'block-5.10-2020-10-12' of git://git.kernel.dk/linux-block"

) into android-mainline

Steps on the way to 5.10-rc1

Resolves conflicts in:
	include/linux/blk-crypto.h

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4012850c2e4b804d9e87e90b8e03a3b9ce21b5e7