| commit | 315480209b8e1032e63c70dafc8f4133b3c9a333 | [log] [tgz] |
|---|---|---|
| author | Martin K. Petersen <martin.petersen@oracle.com> | Wed Aug 11 22:37:22 2021 -0400 |
| committer | Martin K. Petersen <martin.petersen@oracle.com> | Wed Aug 11 22:37:22 2021 -0400 |
| tree | a99d5b3c2c1afb3d2ab47f77ecf4e933cd00715d | |
| parent | 4cc0096e2d54bc31ead127be59e3a2d02a187ac9 [diff] | |
| parent | f0f82e2476f6adb9c7a0135cfab8091456990c99 [diff] |
Merge branch '5.14/scsi-fixes' into 5.15/scsi-staging Resolve mpt3sas conflict between 5.14/scsi-fixes and 5.15/scsi-staging reported by sfr. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>