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>

diff --cc drivers/scsi/bnx2fc/bnx2fc_fcoe.c
Simple merge

diff --cc drivers/scsi/hisi_sas/hisi_sas_main.c
Simple merge

diff --cc drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_init.c
Simple merge

diff --cc drivers/scsi/pm8001/pm8001_hwi.c
Simple merge

diff --cc drivers/scsi/pm8001/pm8001_sas.c
Simple merge

diff --cc drivers/scsi/pm8001/pm80xx_hwi.c
Simple merge

diff --cc drivers/scsi/ufs/ufshcd.c
Simple merge