From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 22 Feb 2021 18:24:58 +0000 (-0800)
Subject: Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Tag: accepted/tizen/unified/20230118.172025~7803
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bdb39c9509e6d31943cb29dbb6ccd1b64013fb98;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull SCSI updates from James Bottomley:
 "This series consists of the usual driver updates (ufs, ibmvfc,
  qla2xxx, hisi_sas, pm80xx) plus the removal of the gdth driver (which
  is bound to cause conflicts with a trivial change somewhere).

  The only big major rework of note is the one from Hannes trying to
  clean up our result handling code in the drivers to make it
  consistent"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (194 commits)
  scsi: MAINTAINERS: Adjust to reflect gdth scsi driver removal
  scsi: ufs: Give clk scaling min gear a value
  scsi: lpfc: Fix 'physical' typos
  scsi: megaraid_mbox: Fix spelling of 'allocated'
  scsi: qla2xxx: Simplify the calculation of variables
  scsi: message: fusion: Fix 'physical' typos
  scsi: target: core: Change ASCQ for residual write
  scsi: target: core: Signal WRITE residuals
  scsi: target: core: Set residuals for 4Kn devices
  scsi: hisi_sas: Add trace FIFO debugfs support
  scsi: hisi_sas: Flush workqueue in hisi_sas_v3_remove()
  scsi: hisi_sas: Enable debugfs support by default
  scsi: hisi_sas: Don't check .nr_hw_queues in hisi_sas_task_prep()
  scsi: hisi_sas: Remove deferred probe check in hisi_sas_v2_probe()
  scsi: lpfc: Add auto select on IRQ_POLL
  scsi: ncr53c8xx: Fix typos
  scsi: lpfc: Fix ancient double free
  scsi: qla2xxx: Fix some memory corruption
  scsi: qla2xxx: Remove redundant NULL check
  scsi: megaraid: Fix ifnullfree.cocci warnings
  ...
---

bdb39c9509e6d31943cb29dbb6ccd1b64013fb98
diff --cc drivers/scsi/ufs/ufshcd-crypto.c
index 153dd57,ec80ec8..d70cdcd
--- a/drivers/scsi/ufs/ufshcd-crypto.c
+++ b/drivers/scsi/ufs/ufshcd-crypto.c
@@@ -179,10 -179,10 +179,10 @@@ int ufshcd_hba_init_crypto_capabilities
  	}
  
  	/* The actual number of configurations supported is (CFGC+1) */
 -	err = blk_ksm_init(&hba->ksm,
 -			   hba->crypto_capabilities.config_count + 1);
 +	err = devm_blk_ksm_init(hba->dev, &hba->ksm,
 +				hba->crypto_capabilities.config_count + 1);
  	if (err)
- 		goto out_free_caps;
+ 		goto out;
  
  	hba->ksm.ksm_ll_ops = ufshcd_ksm_ops;
  	/* UFS only supports 8 bytes for any DUN */
diff --cc drivers/target/target_core_file.c
index cce4559,d1f887e..5a66854
--- a/drivers/target/target_core_file.c
+++ b/drivers/target/target_core_file.c
@@@ -267,8 -266,9 +267,8 @@@ fd_execute_rw_aio(struct se_cmd *cmd, s
  	struct fd_dev *fd_dev = FD_DEV(dev);
  	struct file *file = fd_dev->fd_file;
  	struct target_core_file_cmd *aio_cmd;
- 	struct iov_iter iter = {};
+ 	struct iov_iter iter;
  	struct scatterlist *sg;
 -	struct bio_vec *bvec;
  	ssize_t len = 0;
  	int ret = 0, i;