| commit | 84b20b8062e76a0290aee7360c8238df681c106e | [log] [tgz] |
|---|---|---|
| author | Martin K. Petersen <martin.petersen@oracle.com> | Mon Apr 12 21:41:54 2021 -0400 |
| committer | Martin K. Petersen <martin.petersen@oracle.com> | Mon Apr 12 21:41:54 2021 -0400 |
| tree | 9716475914c1a7caaca229a25b8aa0f2a2c52221 | |
| parent | 857a80bbd7321161f986588160d97815d1b1206a [diff] | |
| parent | 5cd0f6f57639c5afbb36100c69281fee82c95ee7 [diff] |
Merge branch '5.12/scsi-fixes' into 5.13/scsi-staging Resolve a couple of conflicts between the 5.12 fixes branch and the 5.13 staging tree (iSCSI target and UFS). Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>