Merge a9c9a6f7 ("Merge tag 'scsi-misc' of...

Merge a9c9a6f7 ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi"

) into android-mainline

Steps on the way to 5.15-rc1

Resolved merge issues in:
	drivers/scsi/ufs/ufshcd.c

and build issues in:
	drivers/scsi/ufs/ufshcd.c
	drivers/scsi/ufs/ufshcd-crypto.h

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