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

Commit fe709ed8 authored Oct 02, 2012 by James Bottomley

Merge SCSI misc branch into isci-for-3.6 tag

parents 1c4cf1d5 0644f539

Documentation/kernel-parameters.txt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1350,6 +1350,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
	* nohrst, nosrst, norst: suppress hard, soft		* nohrst, nosrst, norst: suppress hard, soft
	and both resets.		and both resets.

			* rstonce: only attempt one reset during
			hot-unplug link recovery

	* dump_id: dump IDENTIFY data.		* dump_id: dump IDENTIFY data.

	If there are multiple matching configurations changing		If there are multiple matching configurations changing

Documentation/scsi/ChangeLog.megaraid_sas

+10 −0

Original line number	Original line	Diff line number	Diff line
			Release Date : Tue. Jun 17, 2012 17:00:00 PST 2012 -
			(emaild-id:megaraidlinux@lsi.com)
			Adam Radford/Kashyap Desai
			Current Version : 00.00.06.18-rc1
			Old Version : 00.00.06.15-rc1
			1. Fix Copyright dates.
			2. Add throttlequeuedepth module parameter.
			3. Add resetwaittime module parameter.
			4. Move poll_aen_lock initializer.
			-------------------------------------------------------------------------------
	Release Date : Mon. Mar 19, 2012 17:00:00 PST 2012 -		Release Date : Mon. Mar 19, 2012 17:00:00 PST 2012 -
	(emaild-id:megaraidlinux@lsi.com)		(emaild-id:megaraidlinux@lsi.com)
	Adam Radford		Adam Radford

Documentation/scsi/LICENSE.qla2xxx

+1 −1

Original line number	Original line	Diff line number	Diff line
	Copyright (c) 2003-2011 QLogic Corporation		Copyright (c) 2003-2012 QLogic Corporation
	QLogic Linux FC-FCoE Driver		QLogic Linux FC-FCoE Driver

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

Documentation/scsi/LICENSE.qla4xxx

+1 −1

Original line number	Original line	Diff line number	Diff line
	Copyright (c) 2003-2011 QLogic Corporation		Copyright (c) 2003-2012 QLogic Corporation
	QLogic Linux iSCSI Driver		QLogic Linux iSCSI Driver

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

Documentation/scsi/st.txt

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -112,10 +112,8 @@ attempted).

	MINOR NUMBERS		MINOR NUMBERS

	The tape driver currently supports 128 drives by default. This number		The tape driver currently supports up to 2^17 drives if 4 modes for
	can be increased by editing st.h and recompiling the driver if		each drive are used.
	necessary. The upper limit is 2^17 drives if 4 modes for each drive
	are used.

	The minor numbers consist of the following bit fields:		The minor numbers consist of the following bit fields: