diff options
| author | Linus Torvalds | 2020-04-18 14:03:12 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2020-04-18 14:03:12 -0700 |
| commit | 50cc09c18985eacbbd666acfd7be2391394733f5 (patch) | |
| tree | be471081b2275ccce0b6eab6cdd21a4da6b86158 /MAINTAINERS | |
| parent | eeaa762549f80ad1d69afbad50bf6d8629ad6649 (diff) | |
| parent | 849f8583e955dbe3a1806e03ecacd5e71cce0a08 (diff) | |
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
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c77f02282044..b816a453b10e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 |