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

Commit b4c43993 authored by James Bottomley's avatar James Bottomley
Browse files

Merge remote-tracking branch 'scsi-queue/drivers-for-3.16' into for-linus

parents 63ff0591 e90b25fa

Documentation/scsi/LICENSE.qla2xxx

+1 −1
Original line number Diff line number Diff line 
Copyright (c) 2003-2013 QLogic Corporation

Copyright (c) 2003-2014 QLogic Corporation

QLogic Linux FC-FCoE Driver



This program includes a device driver for Linux 3.x.

MAINTAINERS

+33 −5
Original line number Diff line number Diff line
@@ -4366,7 +4366,7 @@ S: Supported 
F:	drivers/crypto/nx/



IBM Power 842 compression accelerator

M:	Robert Jennings <rcj@linux.vnet.ibm.com>

M:	Nathan Fontenot <nfont@linux.vnet.ibm.com>

S:	Supported

F:	drivers/crypto/nx/nx-842.c

F:	include/linux/nx842.h
@@ -4382,12 +4382,18 @@ L: netdev@vger.kernel.org 
S:	Supported

F:	drivers/net/ethernet/ibm/ibmveth.*



IBM Power Virtual SCSI/FC Device Drivers

M:	Robert Jennings <rcj@linux.vnet.ibm.com>

IBM Power Virtual SCSI Device Drivers

M:	Nathan Fontenot <nfont@linux.vnet.ibm.com>

L:	linux-scsi@vger.kernel.org

S:	Supported

F:	drivers/scsi/ibmvscsi/

X:	drivers/scsi/ibmvscsi/ibmvstgt.c

F:	drivers/scsi/ibmvscsi/ibmvscsi*

F:	drivers/scsi/ibmvscsi/viosrp.h



IBM Power Virtual FC Device Drivers

M:	Brian King <brking@linux.vnet.ibm.com>

L:	linux-scsi@vger.kernel.org

S:	Supported

F:	drivers/scsi/ibmvscsi/ibmvfc*



IBM ServeRAID RAID DRIVER

P:	Jack Hammer
@@ -6007,6 +6013,28 @@ M: Petr Vandrovec <petr@vandrovec.name> 
S:	Odd Fixes

F:	fs/ncpfs/



NCR 5380 SCSI DRIVERS

M:	Finn Thain <fthain@telegraphics.com.au>

M:	Michael Schmitz <schmitzmic@gmail.com>

L:	linux-scsi@vger.kernel.org

S:	Maintained

F:	Documentation/scsi/g_NCR5380.txt

F:	drivers/scsi/NCR5380.*

F:	drivers/scsi/arm/cumana_1.c

F:	drivers/scsi/arm/oak.c

F:	drivers/scsi/atari_NCR5380.c

F:	drivers/scsi/atari_scsi.*

F:	drivers/scsi/dmx3191d.c

F:	drivers/scsi/dtc.*

F:	drivers/scsi/g_NCR5380.*

F:	drivers/scsi/g_NCR5380_mmio.c

F:	drivers/scsi/mac_scsi.*

F:	drivers/scsi/pas16.*

F:	drivers/scsi/sun3_NCR5380.c

F:	drivers/scsi/sun3_scsi.*

F:	drivers/scsi/sun3_scsi_vme.c

F:	drivers/scsi/t128.*



NCR DUAL 700 SCSI DRIVER (MICROCHANNEL)

M:	"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>

L:	linux-scsi@vger.kernel.org

drivers/message/fusion/mptbase.c

+1 −1
Original line number Diff line number Diff line
@@ -1037,7 +1037,7 @@ mpt_free_msg_frame(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf) 
		goto out;

	/* signature to know if this mf is freed */

	mf->u.frame.linkage.arg1 = cpu_to_le32(0xdeadbeaf);

	list_add_tail(&mf->u.frame.linkage.list, &ioc->FreeQ);

	list_add(&mf->u.frame.linkage.list, &ioc->FreeQ);

#ifdef MFCNT

	ioc->mfcnt--;

#endif

drivers/message/fusion/mptctl.c

+3 −3
Original line number Diff line number Diff line
@@ -2432,9 +2432,9 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size) 
	int			rc, cim_rev;

	ToolboxIstwiReadWriteRequest_t	*IstwiRWRequest;

	MPT_FRAME_HDR		*mf = NULL;

	MPIHeader_t		*mpi_hdr;

	unsigned long		timeleft;

	int			retval;

	u32			msgcontext;



	/* Reset long to int. Should affect IA64 and SPARC only

	 */
@@ -2581,11 +2581,11 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size) 
	}



	IstwiRWRequest = (ToolboxIstwiReadWriteRequest_t *)mf;

	mpi_hdr = (MPIHeader_t *) mf;

	msgcontext = IstwiRWRequest->MsgContext;

	memset(IstwiRWRequest,0,sizeof(ToolboxIstwiReadWriteRequest_t));

	IstwiRWRequest->MsgContext = msgcontext;

	IstwiRWRequest->Function = MPI_FUNCTION_TOOLBOX;

	IstwiRWRequest->Tool = MPI_TOOLBOX_ISTWI_READ_WRITE_TOOL;

	IstwiRWRequest->MsgContext = mpi_hdr->MsgContext;

	IstwiRWRequest->Flags = MPI_TB_ISTWI_FLAGS_READ;

	IstwiRWRequest->NumAddressBytes = 0x01;

	IstwiRWRequest->DataLength = cpu_to_le16(0x04);

drivers/message/fusion/mptfc.c

+5 −7
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ mptfc_slave_alloc(struct scsi_device *sdev) 
}



static int

mptfc_qcmd_lck(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))

mptfc_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *SCpnt)

{

	struct mptfc_rport_info	*ri;

	struct fc_rport	*rport = starget_to_rport(scsi_target(SCpnt->device));
@@ -658,14 +658,14 @@ mptfc_qcmd_lck(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *)) 


	if (!vdevice || !vdevice->vtarget) {

		SCpnt->result = DID_NO_CONNECT << 16;

		done(SCpnt);

		SCpnt->scsi_done(SCpnt);

		return 0;

	}



	err = fc_remote_port_chkready(rport);

	if (unlikely(err)) {

		SCpnt->result = err;

		done(SCpnt);

		SCpnt->scsi_done(SCpnt);

		return 0;

	}
@@ -673,15 +673,13 @@ mptfc_qcmd_lck(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *)) 
	ri = *((struct mptfc_rport_info **)rport->dd_data);

	if (unlikely(!ri)) {

		SCpnt->result = DID_IMM_RETRY << 16;

		done(SCpnt);

		SCpnt->scsi_done(SCpnt);

		return 0;

	}



	return mptscsih_qcmd(SCpnt,done);

	return mptscsih_qcmd(SCpnt);

}



static DEF_SCSI_QCMD(mptfc_qcmd)



/*

 *	mptfc_display_port_link_speed - displaying link speed

 *	@ioc: Pointer to MPT_ADAPTER structure