Commit 50cc09c1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SCSI fixes from James Bottomley:
 "Seven fixes: three in target, one on a sg error leg, two in qla2xxx
  fixing warnings introduced in the last merge window and updating
  MAINTAINERS and one in hisi_sas fixing a problem introduced by libata"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: sg: add sg_remove_request in sg_common_write
  scsi: target: tcmu: reset_ring should reset TCMU_DEV_BIT_BROKEN
  scsi: target: fix PR IN / READ FULL STATUS for FC
  scsi: target: Write NULL to *port_nexus_ptr if no ISID
  scsi: MAINTAINERS: Update qla2xxx FC-SCSI driver maintainer
  scsi: qla2xxx: Fix regression warnings
  scsi: hisi_sas: Fix build error without SATA_HOST
parents eeaa7625 849f8583

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -13857,7 +13857,8 @@ S: Maintained 
F:	drivers/scsi/qla1280.[ch]















QLOGIC QLA2XXX FC-SCSI DRIVER













M:	hmadhani@marvell.com













M:	Nilesh Javali <njavali@marvell.com>













M:	GR-QLogic-Storage-Upstream@marvell.com















L:	linux-scsi@vger.kernel.org















S:	Supported















F:	Documentation/scsi/LICENSE.qla2xxx

































drivers/scsi/hisi_sas/Kconfig



+1
−0






























Original line number
Diff line number
Diff line








@@ -6,6 +6,7 @@ config SCSI_HISI_SAS













	select SCSI_SAS_LIBSAS















	select BLK_DEV_INTEGRITY















	depends on ATA













	select SATA_HOST















	help















		This driver supports HiSilicon's SAS HBA, including support based















		on platform device

































drivers/scsi/qla2xxx/qla_dbg.c



+2
−1






























Original line number
Diff line number
Diff line








@@ -2539,7 +2539,6 @@ ql_dbg(uint level, scsi_qla_host_t *vha, uint id, const char *fmt, ...)













{















	va_list va;















	struct va_format vaf;













	char pbuf[64];































	va_start(va, fmt);

























@@ -2547,6 +2546,8 @@ ql_dbg(uint level, scsi_qla_host_t *vha, uint id, const char *fmt, ...)













	vaf.va = &va;































	if (!ql_mask_match(level)) {













		char pbuf[64];





























		if (vha != NULL) {















			const struct pci_dev *pdev = vha->hw->pdev;















			/* <module-name> <msg-id>:<host> Message */

































drivers/scsi/qla2xxx/qla_init.c



+0
−2






























Original line number
Diff line number
Diff line








@@ -3611,8 +3611,6 @@ qla24xx_detect_sfp(scsi_qla_host_t *vha)













			ha->lr_distance = LR_DISTANCE_5K;















	}





























	if (!vha->flags.init_done)













		rc = QLA_SUCCESS;















out:















	ql_dbg(ql_dbg_async, vha, 0x507b,















	    "SFP detect: %s-Range SFP %s (nvr=%x ll=%x lr=%x lrd=%x).\n",

































drivers/scsi/qla2xxx/qla_isr.c



+0
−1






























Original line number
Diff line number
Diff line








@@ -87,7 +87,6 @@ qla24xx_process_abts(struct scsi_qla_host *vha, void *pkt)













	}































	/* terminate exchange */













	memset(rsp_els, 0, sizeof(*rsp_els));















	rsp_els->entry_type = ELS_IOCB_TYPE;















	rsp_els->entry_count = 1;















	rsp_els->nport_handle = ~0;









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE