diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-24 20:15:28 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-24 20:15:28 +0200 |
| commit | 5b13966693c540f6a6a8d708842b3bce35d0fec7 (patch) | |
| tree | 7943c2e1e67a8b57d8b846d97e70499a420d18a3 /MAINTAINERS | |
| parent | Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | MAINTAINERS: Revise lpfc maintainers for Avago Technologies ownership of Emulex (diff) | |
| download | linux-5b13966693c540f6a6a8d708842b3bce35d0fec7.tar.xz linux-5b13966693c540f6a6a8d708842b3bce35d0fec7.zip | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"This is a set of five fixes: Two MAINTAINER email updates (urgent
because the non-avagotech emails will start bouncing) an lpfc big
endian oops fix, a 256 byte sector hang fix (to eliminate 256 byte
sectors) and a storvsc fix which could cause test unit ready failures
on bringup"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
MAINTAINERS: Revise lpfc maintainers for Avago Technologies ownership of Emulex
MAINTAINERS, be2iscsi: change email domain
sd: Disable support for 256 byte/sector disks
lpfc: Fix breakage on big endian kernels
storvsc: Set the SRB flags correctly when no data transfer is needed
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 60d24f224271..474bcb6c0bac 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3825,10 +3825,11 @@ M: David Woodhouse <dwmw2@infradead.org> L: linux-embedded@vger.kernel.org S: Maintained -EMULEX LPFC FC SCSI DRIVER -M: James Smart <james.smart@emulex.com> +EMULEX/AVAGO LPFC FC/FCOE SCSI DRIVER +M: James Smart <james.smart@avagotech.com> +M: Dick Kennedy <dick.kennedy@avagotech.com> L: linux-scsi@vger.kernel.org -W: http://sourceforge.net/projects/lpfcxxxx +W: http://www.avagotech.com S: Supported F: drivers/scsi/lpfc/ @@ -8829,9 +8830,11 @@ F: drivers/misc/phantom.c F: include/uapi/linux/phantom.h SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER -M: Jayamohan Kallickal <jayamohan.kallickal@emulex.com> +M: Jayamohan Kallickal <jayamohan.kallickal@avagotech.com> +M: Minh Tran <minh.tran@avagotech.com> +M: John Soni Jose <sony.john-n@avagotech.com> L: linux-scsi@vger.kernel.org -W: http://www.emulex.com +W: http://www.avagotech.com S: Supported F: drivers/scsi/be2iscsi/ |