From: Martin K. Petersen <martin.petersen@oracle.com>
Date: Fri, 17 Dec 2021 03:38:19 +0000 (-0500)
Subject: Merge branch '5.16/scsi-fixes' into 5.17/scsi-staging
X-Git-Tag: v5.17-rc1~87^2~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87f77d37d398d92a9963890b14f336dc394f6fa0;p=thirdparty%2Flinux.git

Merge branch '5.16/scsi-fixes' into 5.17/scsi-staging

Pull in the 5.16 fixes branch to resolve a conflict in the UFS driver
core.

Conflicts:
	drivers/scsi/ufs/ufshcd.c

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

87f77d37d398d92a9963890b14f336dc394f6fa0