Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI updates from James Bottomley:
 "Updates to the usual drivers (megaraid_sas, scsi_debug, lpfc, target,
  mpi3mr, hisi_sas, arcmsr).

  The major core change is the constification of the host templates
  (which touches everything) along with other minor fixups and clean
  ups"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (207 commits)
  scsi: ufs: mcq: Use pointer arithmetic in ufshcd_send_command()
  scsi: ufs: mcq: Annotate ufshcd_inc_sq_tail() appropriately
  scsi: cxlflash: s/semahpore/semaphore/
  scsi: lpfc: Silence an incorrect device output
  scsi: mpi3mr: Use IRQ save variants of spinlock to protect chain frame allocation
  scsi: scsi_debug: Fix missing error code in scsi_debug_init()
  scsi: hisi_sas: Work around build failure in suspend function
  scsi: lpfc: Fix ioremap issues in lpfc_sli4_pci_mem_setup()
  scsi: mpt3sas: Fix an issue when driver is being removed
  scsi: mpt3sas: Remove HBA BIOS version in the kernel log
  scsi: target: core: Fix invalid memory access
  scsi: scsi_debug: Drop sdebug_queue
  scsi: scsi_debug: Only allow sdebug_max_queue be modified when no shosts
  scsi: scsi_debug: Use scsi_host_busy() in delay_store() and ndelay_store()
  scsi: scsi_debug: Use blk_mq_tagset_busy_iter() in stop_all_queued()
  scsi: scsi_debug: Use blk_mq_tagset_busy_iter() in sdebug_blk_mq_poll()
  scsi: scsi_debug: Dynamically allocate sdebug_queued_cmd
  scsi: scsi_debug: Use scsi_block_requests() to block queues
  scsi: scsi_debug: Protect block_unblock_all_queues() with mutex
  scsi: scsi_debug: Change shost list lock to a mutex
  ...

diff --cc drivers/ata/ahci_imx.c
Simple merge

diff --cc drivers/ata/ahci_mtk.c
Simple merge

diff --cc drivers/ata/libahci_platform.c
Simple merge

diff --cc drivers/ata/pata_ixp4xx_cf.c
Simple merge

diff --cc drivers/ata/pata_macio.c
Simple merge

diff --cc drivers/ata/pata_parport/pata_parport.c
Simple merge

diff --cc drivers/ata/sata_dwc_460ex.c
Simple merge

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

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

diff --cc drivers/scsi/mpi3mr/mpi3mr_fw.c
Simple merge

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

diff --cc drivers/ufs/core/ufshcd.c
index 70b112038792aed022a9d3441ca862e3e42fdff3,9434328ba3231996430348e5013279203376b968..17d7bb875fee8355b796c2bc842a260ce8e44dbf
--- 1/drivers/ufs/core/ufshcd.c
--- 2/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@@ -8392,22 -8430,6 +8423,21 @@@ static int ufshcd_add_lus(struct ufs_hb
        if (ret)
                goto out;
  
-               memcpy(&hba->clk_scaling.saved_pwr_info.info,
 +      /* Initialize devfreq after UFS device is detected */
 +      if (ufshcd_is_clkscaling_supported(hba)) {
-               hba->clk_scaling.saved_pwr_info.is_valid = true;
++              memcpy(&hba->clk_scaling.saved_pwr_info,
 +                      &hba->pwr_info,
 +                      sizeof(struct ufs_pa_layer_attr));
 +              hba->clk_scaling.is_allowed = true;
 +
 +              ret = ufshcd_devfreq_init(hba);
 +              if (ret)
 +                      goto out;
 +
 +              hba->clk_scaling.is_enabled = true;
 +              ufshcd_init_clk_scaling_sysfs(hba);
 +      }
 +
        ufs_bsg_probe(hba);
        ufshpb_init(hba);
        scsi_scan_host(hba->host);

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

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