Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git (1b98a822) · Commits · e / devices / android_kernel_teracube_2e

Documentation/cciss.txt

+29 −0

Original line number	Diff line number	Diff line
		@@ -133,3 +133,32 @@ hardware and it is important to prevent the kernel from attempting to directly
		access these devices too, as if the array controller were merely a SCSI
		controller in the same way that we are allowing it to access SCSI tape drives.

		SCSI error handling for tape drives and medium changers
		-------------------------------------------------------

		The linux SCSI mid layer provides an error handling protocol which
		kicks into gear whenever a SCSI command fails to complete within a
		certain amount of time (which can vary depending on the command).
		The cciss driver participates in this protocol to some extent. The
		normal protocol is a four step process. First the device is told
		to abort the command. If that doesn't work, the device is reset.
		If that doesn't work, the SCSI bus is reset. If that doesn't work
		the host bus adapter is reset. Because the cciss driver is a block
		driver as well as a SCSI driver and only the tape drives and medium
		changers are presented to the SCSI mid layer, and unlike more
		straightforward SCSI drivers, disk i/o continues through the block
		side during the SCSI error recovery process, the cciss driver only
		implements the first two of these actions, aborting the command, and
		resetting the device. Additionally, most tape drives will not oblige
		in aborting commands, and sometimes it appears they will not even
		obey a reset coommand, though in most circumstances they will. In
		the case that the command cannot be aborted and the device cannot be
		reset, the device will be set offline.

		In the event the error handling code is triggered and a tape drive is
		successfully reset or the tardy command is successfully aborted, the
		tape drive may still not allow i/o to continue until some command
		is issued which positions the tape to a known position. Typically you
		must rewind the tape (by issuing "mt -f /dev/st0 rewind" for example)
		before i/o can proceed again to a tape drive which was reset.

Documentation/early-userspace/README

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ the image from specifications.
		CPIO ARCHIVE method

		You can create a cpio archive that contains the early userspace image.
		Youre cpio archive should be specified in CONFIG_INITRAMFS_SOURCE and it
		Your cpio archive should be specified in CONFIG_INITRAMFS_SOURCE and it
		will be used directly. Only a single cpio file may be specified in
		CONFIG_INITRAMFS_SOURCE and directory and file names are not allowed in
		combination with a cpio archive.

Documentation/networking/ip-sysctl.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,11 @@ inet_peer_gc_maxtime - INTEGER

		TCP variables:

		tcp_abc - INTEGER
		Controls Appropriate Byte Count defined in RFC3465. If set to
		0 then does congestion avoid once per ack. 1 is conservative
		value, and 2 is more agressive.

		tcp_syn_retries - INTEGER
		Number of times initial SYNs for an active TCP connection attempt
		will be retransmitted. Should not be higher than 255. Default value

Documentation/scsi/00-INDEX

+0 −2

Original line number	Diff line number	Diff line
		@@ -52,8 +52,6 @@ ppa.txt
		- info on driver for IOmega zip drive
		qlogicfas.txt
		- info on driver for QLogic FASxxx based adapters
		qlogicisp.txt
		- info on driver for QLogic ISP 1020 based adapters
		scsi-generic.txt
		- info on the sg driver for generic (non-disk/CD/tape) SCSI devices.
		scsi.txt

Documentation/scsi/qlogicfas.txt

+1 −2

Original line number	Diff line number	Diff line
		@@ -11,8 +11,7 @@ Qlogic boards:
		* IQ-PCI-10
		* IQ-PCI-D

		is provided by the qlogicisp.c driver. Check README.qlogicisp for
		details.
		is provided by the qla1280 driver.

		Nor does it support the PCI-Basic, which is supported by the
		'am53c974' driver.