Merge commit 'v2.6.31-rc3'; commit 'tip/oprofile' into oprofile/core (debc6a69) · Commits · e / devices / android_kernel_fairphone_FP5

.gitignore

+10 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		# subdirectories here. Add them in the ".gitignore" file
		# in that subdirectory instead.
		#
		# NOTE! Please use 'git-ls-files -i --exclude-standard'
		# NOTE! Please use 'git ls-files -i --exclude-standard'
		# command after changing this file, to see if there are
		# any tracked files which get ignored after the change.
		#
		@@ -25,6 +25,9 @@
		*.elf
		*.bin
		*.gz
		*.lzma
		*.patch
		*.gcno

		#
		# Top-level generic files
		@@ -62,6 +65,12 @@ series
		cscope.*
		ncscope.*

		# gnu global files
		GPATH
		GRTAGS
		GSYMS
		GTAGS

		*.orig
		*~
		\#*#

CREDITS

+4 −0

Original line number	Diff line number	Diff line
		@@ -1253,6 +1253,10 @@ S: 8124 Constitution Apt. 7
		S: Sterling Heights, Michigan 48313
		S: USA

		N: Wolfgang Grandegger
		E: wg@grandegger.com
		D: Controller Area Network (device drivers)

		N: William Greathouse
		E: wgreathouse@smva.com
		E: wgreathouse@myfavoritei.com

Documentation/ABI/testing/sysfs-block

+59 −0

Original line number	Diff line number	Diff line
		@@ -60,3 +60,62 @@ Description:
		Indicates whether the block layer should automatically
		generate checksums for write requests bound for
		devices that support receiving integrity metadata.

		What: /sys/block/<disk>/alignment_offset
		Date: April 2009
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		Storage devices may report a physical block size that is
		bigger than the logical block size (for instance a drive
		with 4KB physical sectors exposing 512-byte logical
		blocks to the operating system). This parameter
		indicates how many bytes the beginning of the device is
		offset from the disk's natural alignment.

		What: /sys/block/<disk>/<partition>/alignment_offset
		Date: April 2009
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		Storage devices may report a physical block size that is
		bigger than the logical block size (for instance a drive
		with 4KB physical sectors exposing 512-byte logical
		blocks to the operating system). This parameter
		indicates how many bytes the beginning of the partition
		is offset from the disk's natural alignment.

		What: /sys/block/<disk>/queue/logical_block_size
		Date: May 2009
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		This is the smallest unit the storage device can
		address. It is typically 512 bytes.

		What: /sys/block/<disk>/queue/physical_block_size
		Date: May 2009
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		This is the smallest unit the storage device can write
		without resorting to read-modify-write operation. It is
		usually the same as the logical block size but may be
		bigger. One example is SATA drives with 4KB sectors
		that expose a 512-byte logical block size to the
		operating system.

		What: /sys/block/<disk>/queue/minimum_io_size
		Date: April 2009
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		Storage devices may report a preferred minimum I/O size,
		which is the smallest request the device can perform
		without incurring a read-modify-write penalty. For disk
		drives this is often the physical block size. For RAID
		arrays it is often the stripe chunk size.

		What: /sys/block/<disk>/queue/optimal_io_size
		Date: April 2009
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		Storage devices may report an optimal I/O size, which is
		the device's preferred unit of receiving I/O. This is
		rarely reported for disk drives. For RAID devices it is
		usually the stripe width or the internal block size.

Documentation/ABI/testing/sysfs-bus-pci

+7 −0

Original line number	Diff line number	Diff line
		@@ -122,3 +122,10 @@ Description:
		This symbolic link appears when a device is a Virtual Function.
		The symbolic link points to the PCI device sysfs entry of the
		Physical Function this device associates with.

		What: /sys/bus/pci/slots/.../module
		Date: June 2009
		Contact: linux-pci@vger.kernel.org
		Description:
		This symbolic link points to the PCI hotplug controller driver
		module that manages the hotplug slot.

Documentation/ABI/testing/sysfs-bus-pci-devices-cciss

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		Where: /sys/bus/pci/devices/<dev>/ccissX/cXdY/model
		Date: March 2009
		Kernel Version: 2.6.30
		Contact: iss_storagedev@hp.com
		Description: Displays the SCSI INQUIRY page 0 model for logical drive
		Y of controller X.

		Where: /sys/bus/pci/devices/<dev>/ccissX/cXdY/rev
		Date: March 2009
		Kernel Version: 2.6.30
		Contact: iss_storagedev@hp.com
		Description: Displays the SCSI INQUIRY page 0 revision for logical
		drive Y of controller X.

		Where: /sys/bus/pci/devices/<dev>/ccissX/cXdY/unique_id
		Date: March 2009
		Kernel Version: 2.6.30
		Contact: iss_storagedev@hp.com
		Description: Displays the SCSI INQUIRY page 83 serial number for logical
		drive Y of controller X.

		Where: /sys/bus/pci/devices/<dev>/ccissX/cXdY/vendor
		Date: March 2009
		Kernel Version: 2.6.30
		Contact: iss_storagedev@hp.com
		Description: Displays the SCSI INQUIRY page 0 vendor for logical drive
		Y of controller X.

		Where: /sys/bus/pci/devices/<dev>/ccissX/cXdY/block:cciss!cXdY
		Date: March 2009
		Kernel Version: 2.6.30
		Contact: iss_storagedev@hp.com
		Description: A symbolic link to /sys/block/cciss!cXdY