Merge branch '5.14/scsi-fixes' into 5.15/scsi-staging

Resolve mpt3sas conflict between 5.14/scsi-fixes and 5.15/scsi-staging
reported by sfr.

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

diff --cc drivers/scsi/ibmvscsi/ibmvfc.c
Simple merge

diff --cc drivers/scsi/mpt3sas/mpt3sas_base.c
index e7f6fbb282bd744744cf0e2eedc8d00b799a4fab,19b1c0cf5f2a2b35abe38c6102b35751d02c9510..2528c4e7b0e014ae62ace3994217ccf200c82dba
--- 1/drivers/scsi/mpt3sas/mpt3sas_base.c
--- 2/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@@ -8738,8 -8471,7 +8738,8 @@@ mpt3sas_base_hard_reset_handler(struct 
        _base_pre_reset_handler(ioc);
        mpt3sas_wait_for_commands_to_complete(ioc);
        mpt3sas_base_mask_interrupts(ioc);
-       r = _base_make_ioc_ready(ioc, type);
 +      mpt3sas_base_pause_mq_polling(ioc);
+       r = mpt3sas_base_make_ioc_ready(ioc, type);
        if (r)
                goto out;
        _base_clear_outstanding_commands(ioc);

diff --cc drivers/scsi/mpt3sas/mpt3sas_base.h
index 3cf2e4615ff55bde1a1cd20718413ba0b8e890d4,0c6c3df0038d52dc6b5e65c2087d7e5988151703..f87c0911f66ad760842a795c505f7132dd48fc80
--- 1/drivers/scsi/mpt3sas/mpt3sas_base.h
--- 2/drivers/scsi/mpt3sas/mpt3sas_base.h
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
@@@ -1755,9 -1730,10 +1755,12 @@@ do {  ioc_err(ioc, "In func: %s\n", __fu
        status, mpi_request, sz); } while (0)
  
  int mpt3sas_wait_for_ioc(struct MPT3SAS_ADAPTER *ioc, int wait_count);
 -int
 -mpt3sas_base_make_ioc_ready(struct MPT3SAS_ADAPTER *ioc, enum reset_type type);
++int mpt3sas_base_make_ioc_ready(struct MPT3SAS_ADAPTER *ioc, enum reset_type type);
+ void mpt3sas_base_free_irq(struct MPT3SAS_ADAPTER *ioc);
+ void mpt3sas_base_disable_msix(struct MPT3SAS_ADAPTER *ioc);
 +int mpt3sas_blk_mq_poll(struct Scsi_Host *shost, unsigned int queue_num);
 +void mpt3sas_base_pause_mq_polling(struct MPT3SAS_ADAPTER *ioc);
 +void mpt3sas_base_resume_mq_polling(struct MPT3SAS_ADAPTER *ioc);
  
  /* scsih shared API */
  struct scsi_cmnd *mpt3sas_scsih_scsi_lookup_get(struct MPT3SAS_ADAPTER *ioc,

diff --cc drivers/scsi/mpt3sas/mpt3sas_scsih.c
Simple merge

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

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

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

diff --cc drivers/target/target_core_transport.c
Simple merge