| commit | 556666bce111b2a758010c2a2a6bab7f3770f4de | [log] [tgz] |
|---|---|---|
| author | Martin K. Petersen <martin.petersen@oracle.com> | Mon Apr 05 22:57:29 2021 -0400 |
| committer | Martin K. Petersen <martin.petersen@oracle.com> | Mon Apr 05 22:57:29 2021 -0400 |
| tree | 3a35ea6f9a9aa43b82166afc1f329084dd55c729 | |
| parent | 4e2e619f3c9e3c49859f085995554a53e9fc0e02 [diff] | |
| parent | 9e67600ed6b8565da4b85698ec659b5879a6c1c6 [diff] |
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 <martin.petersen@oracle.com>