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

Merge the 5.15/scsi-fixes branch into the staging tree to resolve UFS
conflict reported by sfr.

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

diff --cc drivers/scsi/elx/efct/efct_lio.c
Simple merge

diff --cc drivers/scsi/elx/efct/efct_scsi.c
Simple merge

diff --cc drivers/scsi/elx/libefc/efc_fabric.c
Simple merge

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

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

diff --cc drivers/scsi/lpfc/lpfc_hw4.h
Simple merge

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

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

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

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

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

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

diff --cc drivers/scsi/ufs/ufshcd.c
index d91a405fd1815d9650dec5d226d39f9bf9a144fb,95be7ecdfe10b8c00d166535e2ec54bfe4c4f72e..9283ab4ca2da36689757d0445050442b7e80c95d
--- 1/drivers/scsi/ufs/ufshcd.c
--- 2/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@@ -6063,23 -6034,22 +6053,24 @@@ static bool ufshcd_is_pwr_mode_restore_
  
  /**
   * ufshcd_err_handler - handle UFS errors that require s/w attention
-  * @host: SCSI host pointer
+  * @work: pointer to work structure
   */
- static void ufshcd_err_handler(struct Scsi_Host *host)
+ static void ufshcd_err_handler(struct work_struct *work)
  {
-       struct ufs_hba *hba = shost_priv(host);
 +      int retries = MAX_ERR_HANDLER_RETRIES;
+       struct ufs_hba *hba;
        unsigned long flags;
 -      bool err_xfer = false;
 -      bool err_tm = false;
 -      int err = 0, pmc_err;
 +      bool needs_restore;
 +      bool needs_reset;
 +      bool err_xfer;
 +      bool err_tm;
 +      int pmc_err;
        int tag;
 -      bool needs_reset = false, needs_restore = false;
  
+       hba = container_of(work, struct ufs_hba, eh_work);
+ 
        down(&hba->host_sem);
        spin_lock_irqsave(hba->host->host_lock, flags);
-       hba->host->host_eh_scheduled = 0;
        if (ufshcd_err_handling_should_stop(hba)) {
                if (hba->ufshcd_state != UFSHCD_STATE_ERROR)
                        hba->ufshcd_state = UFSHCD_STATE_OPERATIONAL;

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

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

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