diff options
author | Martin K. Petersen <martin.petersen@oracle.com> | 2022-02-14 21:51:29 -0500 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2022-02-14 21:51:29 -0500 |
commit | ac2beb4e3bd75b0049068516b9d42201bda0ded3 (patch) | |
tree | 09cedfe4495364c2e1114370e282b6028079a565 /drivers/scsi/hpsa.c | |
parent | 22754f7fbb4030eb2d5e73c2a2db63637ed1d105 (diff) | |
parent | 5852ed2a6a39c862c8a3fdf646e1f4e01b91d710 (diff) |
Merge branch '5.17/scsi-fixes' into 5.18/scsi-staging
Pull 5.17 fixes branch into 5.18 tree to resolve a few pm8001 driver
merge conflicts.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/hpsa.c')
0 files changed, 0 insertions, 0 deletions