OSDN Git Service

Merge branch '5.17/scsi-fixes' into 5.18/scsi-staging
authorMartin K. Petersen <martin.petersen@oracle.com>
Tue, 15 Feb 2022 02:51:29 +0000 (21:51 -0500)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 15 Feb 2022 02:51:29 +0000 (21:51 -0500)
commitac2beb4e3bd75b0049068516b9d42201bda0ded3
tree09cedfe4495364c2e1114370e282b6028079a565
parent22754f7fbb4030eb2d5e73c2a2db63637ed1d105
parent5852ed2a6a39c862c8a3fdf646e1f4e01b91d710
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>
drivers/scsi/bnx2fc/bnx2fc_fcoe.c
drivers/scsi/hisi_sas/hisi_sas_main.c
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
drivers/scsi/lpfc/lpfc_init.c
drivers/scsi/pm8001/pm8001_hwi.c
drivers/scsi/pm8001/pm8001_sas.c
drivers/scsi/pm8001/pm80xx_hwi.c
drivers/scsi/ufs/ufshcd.c