diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2021-08-12 04:37:22 +0200 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-08-12 04:37:22 +0200 |
| commit | 315480209b8e1032e63c70dafc8f4133b3c9a333 (patch) | |
| tree | a99d5b3c2c1afb3d2ab47f77ecf4e933cd00715d /drivers/scsi/qedi | |
| parent | scsi: isci: Use the proper SCSI midlayer interfaces for PI (diff) | |
| parent | scsi: core: Fix capacity set to zero after offlinining device (diff) | |
| download | linux-315480209b8e1032e63c70dafc8f4133b3c9a333.tar.xz linux-315480209b8e1032e63c70dafc8f4133b3c9a333.zip | |
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>
Diffstat (limited to 'drivers/scsi/qedi')
0 files changed, 0 insertions, 0 deletions