From: Martin K. Petersen Date: Tue, 6 Apr 2021 02:57:29 +0000 (-0400) Subject: Merge branch '5.12/scsi-fixes' into 5.13/scsi-staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=556666bce111b2a758010c2a2a6bab7f3770f4de;p=linux.git Merge branch '5.12/scsi-fixes' into 5.13/scsi-staging Pull 5.12/scsi-fixes into the 5.13 SCSI tree to provide a baseline for some UFS changes that would otherwise cause conflicts during the merge. Signed-off-by: Martin K. Petersen --- 556666bce111b2a758010c2a2a6bab7f3770f4de