diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2021-12-16 22:38:19 -0500 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-12-16 22:38:19 -0500 |
| commit | 87f77d37d398d92a9963890b14f336dc394f6fa0 (patch) | |
| tree | b5a2d5bd5c67642b9546c15c1a87fddaeb96c830 /tools/perf/scripts/python/bin | |
| parent | scsi: hpsa: Remove an unused variable in hpsa_update_scsi_devices() (diff) | |
| parent | scsi: qla2xxx: Format log strings only if needed (diff) | |
| download | linux-87f77d37d398d92a9963890b14f336dc394f6fa0.tar.gz linux-87f77d37d398d92a9963890b14f336dc394f6fa0.zip | |
Merge branch '5.16/scsi-fixes' into 5.17/scsi-staging
Pull in the 5.16 fixes branch to resolve a conflict in the UFS driver
core.
Conflicts:
drivers/scsi/ufs/ufshcd.c
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'tools/perf/scripts/python/bin')
0 files changed, 0 insertions, 0 deletions