Merge branch 'tracing/core' into tracing/hw-breakpoints (a1922ed6) · Commits · e / devices / android_kernel_fairphone_FP3

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		*.gz
		*.lzma
		*.patch
		*.gcno

		#
		# Top-level generic files

CREDITS

+7 −1

Original line number	Diff line number	Diff line
		@@ -1856,7 +1856,7 @@ E: rfkoenig@immd4.informatik.uni-erlangen.de
		D: The Linux Support Team Erlangen

		N: Andreas Koensgen
		E: ajk@iehk.rwth-aachen.de
		E: ajk@comnets.uni-bremen.de
		D: 6pack driver for AX.25

		N: Harald Koerfgen
		@@ -2006,6 +2006,9 @@ E: paul@laufernet.com
		D: Soundblaster driver fixes, ISAPnP quirk
		S: California, USA

		N: Jonathan Layes
		D: ARPD support

		N: Tom Lees
		E: tom@lpsg.demon.co.uk
		W: http://www.lpsg.demon.co.uk/
		@@ -3802,6 +3805,9 @@ S: van Bronckhorststraat 12
		S: 2612 XV Delft
		S: The Netherlands

		N: Thomas Woller
		D: CS461x Cirrus Logic sound driver

		N: David Woodhouse
		E: dwmw2@infradead.org
		D: JFFS2 file system, Memory Technology Device subsystem,

Documentation/ABI/testing/sysfs-block

+23 −14

Original line number	Diff line number	Diff line
		@@ -94,28 +94,37 @@ 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.
		This is the smallest unit a physical storage device can
		write atomically. 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. For stacked block
		devices the physical_block_size variable contains the
		maximum physical_block_size of the component devices.

		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.
		Storage devices may report a granularity or preferred
		minimum I/O size which is the smallest request the
		device can perform without incurring a performance
		penalty. For disk drives this is often the physical
		block size. For RAID arrays it is often the stripe
		chunk size. A properly aligned multiple of
		minimum_io_size is the preferred request size for
		workloads where a high number of I/O operations is
		desired.

		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.
		the device's preferred unit for sustained I/O. This is
		rarely reported for disk drives. For RAID arrays it is
		usually the stripe width or the internal track size. A
		properly aligned multiple of optimal_io_size is the
		preferred request size for workloads where sustained
		throughput is desired. If no optimal I/O size is
		reported this file contains 0.

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-class-mtd

0 → 100644

+125 −0

Original line number	Diff line number	Diff line
		What: /sys/class/mtd/
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		The mtd/ class subdirectory belongs to the MTD subsystem
		(MTD core).

		What: /sys/class/mtd/mtdX/
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		The /sys/class/mtd/mtd{0,1,2,3,...} directories correspond
		to each /dev/mtdX character device. These may represent
		physical/simulated flash devices, partitions on a flash
		device, or concatenated flash devices. They exist regardless
		of whether CONFIG_MTD_CHAR is actually enabled.

		What: /sys/class/mtd/mtdXro/
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		These directories provide the corresponding read-only device
		nodes for /sys/class/mtd/mtdX/ . They are only created
		(for the benefit of udev) if CONFIG_MTD_CHAR is enabled.

		What: /sys/class/mtd/mtdX/dev
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		Major and minor numbers of the character device corresponding
		to this MTD device (in <major>:<minor> format). This is the
		read-write device so <minor> will be even.

		What: /sys/class/mtd/mtdXro/dev
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		Major and minor numbers of the character device corresponding
		to the read-only variant of thie MTD device (in
		<major>:<minor> format). In this case <minor> will be odd.

		What: /sys/class/mtd/mtdX/erasesize
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		"Major" erase size for the device. If numeraseregions is
		zero, this is the eraseblock size for the entire device.
		Otherwise, the MEMGETREGIONCOUNT/MEMGETREGIONINFO ioctls
		can be used to determine the actual eraseblock layout.

		What: /sys/class/mtd/mtdX/flags
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		A hexadecimal value representing the device flags, ORed
		together:

		0x0400: MTD_WRITEABLE - device is writable
		0x0800: MTD_BIT_WRITEABLE - single bits can be flipped
		0x1000: MTD_NO_ERASE - no erase necessary
		0x2000: MTD_POWERUP_LOCK - always locked after reset

		What: /sys/class/mtd/mtdX/name
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		A human-readable ASCII name for the device or partition.
		This will match the name in /proc/mtd .

		What: /sys/class/mtd/mtdX/numeraseregions
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		For devices that have variable eraseblock sizes, this
		provides the total number of erase regions. Otherwise,
		it will read back as zero.

		What: /sys/class/mtd/mtdX/oobsize
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		Number of OOB bytes per page.

		What: /sys/class/mtd/mtdX/size
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		Total size of the device/partition, in bytes.

		What: /sys/class/mtd/mtdX/type
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		One of the following ASCII strings, representing the device
		type:

		absent, ram, rom, nor, nand, dataflash, ubi, unknown

		What: /sys/class/mtd/mtdX/writesize
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		Minimal writable flash unit size. This will always be
		a positive integer.

		In the case of NOR flash it is 1 (even though individual
		bits can be cleared).

		In the case of NAND flash it is one NAND page (or a
		half page, or a quarter page).

		In the case of ECC NOR, it is the ECC block size.