Commit b2c9a83d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more SCSI updates from James Bottomley:
 "Mostly small bug fixes plus other trivial updates.

  The major change of note is moving ufs out of scsi and a minor update
  to lpfc vmid handling"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (24 commits)
  scsi: qla2xxx: Remove unused 'ql_dm_tgt_ex_pct' parameter
  scsi: qla2xxx: Remove setting of 'req' and 'rsp' parameters
  scsi: mpi3mr: Fix kernel-doc
  scsi: lpfc: Add support for ATTO Fibre Channel devices
  scsi: core: Return BLK_STS_TRANSPORT for ALUA transitioning
  scsi: sd_zbc: Prevent zone information memory leak
  scsi: sd: Fix potential NULL pointer dereference
  scsi: mpi3mr: Rework mrioc->bsg_device model to fix warnings
  scsi: myrb: Fix up null pointer access on myrb_cleanup()
  scsi: core: Unexport scsi_bus_type
  scsi: sd: Don't call blk_cleanup_disk() in sd_probe()
  scsi: ufs: ufshcd: Delete unnecessary NULL check
  scsi: isci: Fix typo in comment
  scsi: pmcraid: Fix typo in comment
  scsi: smartpqi: Fix typo in comment
  scsi: qedf: Fix typo in comment
  scsi: esas2r: Fix typo in comment
  scsi: storvsc: Fix typo in comment
  scsi: ufs: Split the drivers/scsi/ufs directory
  scsi: qla1280: Remove redundant variable
  ...
parents 29814363 aa2a4ded

MAINTAINERS

+6 −4
Original line number Diff line number Diff line
@@ -2565,7 +2565,7 @@ F: drivers/pci/controller/dwc/pcie-qcom.c 
F:	drivers/phy/qualcomm/

F:	drivers/power/*/msm*

F:	drivers/reset/reset-qcom-*

F:	drivers/scsi/ufs/ufs-qcom*

F:	drivers/ufs/host/ufs-qcom*

F:	drivers/spi/spi-geni-qcom.c

F:	drivers/spi/spi-qcom-qspi.c

F:	drivers/spi/spi-qup.c
@@ -17755,6 +17755,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git

F:	Documentation/devicetree/bindings/scsi/

F:	drivers/scsi/

F:	drivers/ufs/

F:	include/scsi/









SCSI TAPE DRIVER








@@ -20414,24 +20415,25 @@ F:	include/uapi/linux/cdrom.h







UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER









R:	Alim Akhtar <alim.akhtar@samsung.com>









R:	Avri Altman <avri.altman@wdc.com>









R:	Bart Van Assche <bvanassche@acm.org>









L:	linux-scsi@vger.kernel.org









S:	Supported









F:	Documentation/devicetree/bindings/ufs/









F:	Documentation/scsi/ufs.rst









F:	drivers/scsi/ufs/









F:	drivers/ufs/core/

















UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER DWC HOOKS









M:	Pedro Sousa <pedrom.sousa@synopsys.com>









L:	linux-scsi@vger.kernel.org









S:	Supported









F:	drivers/scsi/ufs/*dwc*









F:	drivers/ufs/host/*dwc*

















UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER MEDIATEK HOOKS









M:	Stanley Chu <stanley.chu@mediatek.com>









L:	linux-scsi@vger.kernel.org









L:	linux-mediatek@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









F:	drivers/scsi/ufs/ufs-mediatek*









F:	drivers/ufs/host/ufs-mediatek*

















UNSORTED BLOCK IMAGES (UBI)









M:	Richard Weinberger <richard@nod.at>

























drivers/Kconfig



+2
−0






























Original line number
Diff line number
Diff line







@@ -107,6 +107,8 @@ source "drivers/usb/Kconfig"

















source "drivers/mmc/Kconfig"



















source "drivers/ufs/Kconfig"



















source "drivers/memstick/Kconfig"



















source "drivers/leds/Kconfig"
































drivers/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -128,6 +128,7 @@ obj-$(CONFIG_PM_OPP)		+= opp/







obj-$(CONFIG_CPU_FREQ)		+= cpufreq/









obj-$(CONFIG_CPU_IDLE)		+= cpuidle/









obj-y				+= mmc/









obj-y				+= ufs/









obj-$(CONFIG_MEMSTICK)		+= memstick/









obj-$(CONFIG_NEW_LEDS)		+= leds/









obj-$(CONFIG_INFINIBAND)	+= infiniband/
































drivers/nvme/host/fc.c



+18
−0






























Original line number
Diff line number
Diff line







@@ -1899,6 +1899,24 @@ nvme_fc_ctrl_ioerr_work(struct work_struct *work)







	nvme_fc_error_recovery(ctrl, "transport detected io error");









}



















/*









 * nvme_fc_io_getuuid - Routine called to get the appid field









 * associated with request by the lldd









 * @req:IO request from nvme fc to driver









 * Returns: UUID if there is an appid associated with VM or









 * NULL if the user/libvirt has not set the appid to VM









 */









char *nvme_fc_io_getuuid(struct nvmefc_fcp_req *req)









{









	struct nvme_fc_fcp_op *op = fcp_req_to_fcp_op(req);









	struct request *rq = op->rq;



















	if (!IS_ENABLED(CONFIG_BLK_CGROUP_FC_APPID) || !rq->bio)









		return NULL;









	return blkcg_get_fc_appid(rq->bio);









}









EXPORT_SYMBOL_GPL(nvme_fc_io_getuuid);



















static void









nvme_fc_fcpio_done(struct nvmefc_fcp_req *req)









{
































drivers/scsi/Kconfig



+0
−1






























Original line number
Diff line number
Diff line







@@ -500,7 +500,6 @@ source "drivers/scsi/megaraid/Kconfig.megaraid"







source "drivers/scsi/mpt3sas/Kconfig"









source "drivers/scsi/mpi3mr/Kconfig"









source "drivers/scsi/smartpqi/Kconfig"









source "drivers/scsi/ufs/Kconfig"



















config SCSI_HPTIOP









	tristate "HighPoint RocketRAID 3xxx/4xxx Controller support"