Merge branch '6.5/scsi-fixes' into 6.6/scsi-staging

Pull in the fixes tree for a commit that missed 6.5. Also resolve a
trivial merge conflict in fnic.

* 6.5/scsi-fixes: (36 commits)
  scsi: storvsc: Handle additional SRB status values
  scsi: snic: Fix double free in snic_tgt_create()
  scsi: core: raid_class: Remove raid_component_add()
  scsi: ufs: ufs-qcom: Clear qunipro_g4_sel for HW major version > 5
  scsi: ufs: mcq: Fix the search/wrap around logic
  scsi: qedf: Fix firmware halt over suspend and resume
  scsi: qedi: Fix firmware halt over suspend and resume
  scsi: qedi: Fix potential deadlock on &qedi_percpu->p_work_lock
  scsi: lpfc: Remove reftag check in DIF paths
  scsi: ufs: renesas: Fix private allocation
  scsi: snic: Fix possible memory leak if device_add() fails
  scsi: core: Fix possible memory leak if device_add() fails
  scsi: core: Fix legacy /proc parsing buffer overflow
  scsi: 53c700: Check that command slot is not NULL
  scsi: fnic: Replace return codes in fnic_clean_pending_aborts()
  scsi: storvsc: Fix handling of virtual Fibre Channel timeouts
  scsi: pm80xx: Fix error return code in pm8001_pci_probe()
  scsi: zfcp: Defer fc_rport blocking until after ADISC response
  scsi: storvsc: Limit max_sectors for virtual Fibre Channel devices
  scsi: sg: Fix checking return value of blk_get_queue()
  ...

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --cc Documentation/ABI/testing/sysfs-driver-ufs
Simple merge

diff --cc drivers/scsi/fnic/fnic_scsi.c
Simple merge

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

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

diff --cc drivers/scsi/qla2xxx/qla_def.h
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_init.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_iocb.c
Simple merge

diff --cc drivers/scsi/storvsc_drv.c
Simple merge

diff --cc drivers/ufs/core/ufs-mcq.c
Simple merge

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

diff --cc drivers/ufs/host/ufs-qcom.c
Simple merge

diff --cc drivers/ufs/host/ufs-renesas.c
Simple merge

diff --cc include/uapi/scsi/scsi_bsg_ufs.h
Simple merge

diff --cc include/ufs/ufs.h
Simple merge