Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b139666 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:
 "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
parents c5db6a3b 32505876

MAINTAINERS

+8 −5
Original line number Diff line number Diff line
@@ -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/

drivers/scsi/be2iscsi/be.h

+3 −3
Original line number Diff line number Diff line 
/**

 * Copyright (C) 2005 - 2014 Emulex

 * Copyright (C) 2005 - 2015 Avago Technologies

 * All rights reserved.

 *

 * This program is free software; you can redistribute it and/or
@@ -8,9 +8,9 @@ 
 * Public License is included in this distribution in the file called COPYING.

 *

 * Contact Information:

 * linux-drivers@emulex.com

 * linux-drivers@avagotech.com

 *

 * Emulex

 * Avago Technologies

 * 3333 Susan Street

 * Costa Mesa, CA 92626

 */

drivers/scsi/be2iscsi/be_cmds.c

+3 −3
Original line number Diff line number Diff line 
/**

 * Copyright (C) 2005 - 2014 Emulex

 * Copyright (C) 2005 - 2015 Avago Technologies

 * All rights reserved.

 *

 * This program is free software; you can redistribute it and/or
@@ -8,9 +8,9 @@ 
 * Public License is included in this distribution in the file called COPYING.

 *

 * Contact Information:

 * linux-drivers@emulex.com

 * linux-drivers@avagotech.com

 *

 * Emulex

 * Avago Technologies

 * 3333 Susan Street

 * Costa Mesa, CA 92626

 */

drivers/scsi/be2iscsi/be_cmds.h

+3 −3
Original line number Diff line number Diff line 
/**

 * Copyright (C) 2005 - 2014 Emulex

 * Copyright (C) 2005 - 2015 Avago Technologies

 * All rights reserved.

 *

 * This program is free software; you can redistribute it and/or
@@ -8,9 +8,9 @@ 
 * Public License is included in this distribution in the file called COPYING.

 *

 * Contact Information:

 * linux-drivers@emulex.com

 * linux-drivers@avagotech.com

 *

 * Emulex

 * Avago Technologies

 * 3333 Susan Street

 * Costa Mesa, CA 92626

 */

drivers/scsi/be2iscsi/be_iscsi.c

+4 −4
Original line number Diff line number Diff line 
/**

 * Copyright (C) 2005 - 2014 Emulex

 * Copyright (C) 2005 - 2015 Avago Technologies

 * All rights reserved.

 *

 * This program is free software; you can redistribute it and/or
@@ -7,12 +7,12 @@ 
 * as published by the Free Software Foundation.  The full GNU General

 * Public License is included in this distribution in the file called COPYING.

 *

 * Written by: Jayamohan Kallickal (jayamohan.kallickal@emulex.com)

 * Written by: Jayamohan Kallickal (jayamohan.kallickal@avagotech.com)

 *

 * Contact Information:

 * linux-drivers@emulex.com

 * linux-drivers@avagotech.com

 *

 * Emulex

 * Avago Technologies

 * 3333 Susan Street

 * Costa Mesa, CA 92626

 */