diff options
| author | Linus Torvalds | 2016-08-05 23:47:27 -0400 |
|---|---|---|
| committer | Linus Torvalds | 2016-08-05 23:47:27 -0400 |
| commit | 0603006b450004213eeed22d4fbcc103c994c2e6 (patch) | |
| tree | c9abb1df1ba533db23b23eeae2a2a4464105515e /MAINTAINERS | |
| parent | d268675c1f084abcc32070008c5b547d31341005 (diff) | |
| parent | c8e18acccb9be6dd1aa4fb8dbc1b98b3b7d6d8e1 (diff) | |
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"This is seven basic fixes (plus one MAINTAINER update) which came in
close to the merge window"
* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
ipr: Fix error return code in ipr_probe_ioa()
fcoe: add missing destroy_workqueue() on error in fcoe_init()
lpfc: Fix possible NULL pointer dereference
fcoe: Use default VLAN for FIP VLAN discovery
ipr: Wait to do async scan until scsi host is initialized
MAINTAINERS: Update cxlflash maintainers
cxlflash: Verify problem state area is mapped before notifying shutdown
lpfc: fix oops in lpfc_sli4_scmd_to_wqidx_distr() from lpfc_send_taskmgmt()
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e9c75275405d..a4476dba6a0b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3494,6 +3494,7 @@ F: Documentation/ABI/testing/sysfs-class-cxl CXLFLASH (IBM Coherent Accelerator Processor Interface CAPI Flash) SCSI DRIVER M: Manoj N. Kumar <manoj@linux.vnet.ibm.com> M: Matthew R. Ochs <mrochs@linux.vnet.ibm.com> +M: Uma Krishnan <ukrishn@linux.vnet.ibm.com> L: linux-scsi@vger.kernel.org S: Supported F: drivers/scsi/cxlflash/ |