Merge branch 'linus' into sched/core (348b346b) · Commits · jan.koester / Linux

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-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.

Documentation/ABI/testing/sysfs-fs-ext4

+10 −0

Original line number	Diff line number	Diff line
		@@ -79,3 +79,13 @@ Description:
		This file is read-only and shows the number of
		kilobytes of data that have been written to this
		filesystem since it was mounted.

		What: /sys/fs/ext4/<disk>/inode_goal
		Date: June 2008
		Contact: "Theodore Ts'o" <tytso@mit.edu>
		Description:
		Tuning parameter which (if non-zero) controls the goal
		inode used by the inode allocator in p0reference to
		all other allocation hueristics. This is intended for
		debugging use only, and should be 0 on production
		systems.

Documentation/ABI/testing/sysfs-pps

0 → 100644

+73 −0

Original line number	Diff line number	Diff line
		What: /sys/class/pps/
		Date: February 2008
		Contact: Rodolfo Giometti <giometti@linux.it>
		Description:
		The /sys/class/pps/ directory will contain files and
		directories that will provide a unified interface to
		the PPS sources.

		What: /sys/class/pps/ppsX/
		Date: February 2008
		Contact: Rodolfo Giometti <giometti@linux.it>
		Description:
		The /sys/class/pps/ppsX/ directory is related to X-th
		PPS source into the system. Each directory will
		contain files to manage and control its PPS source.

		What: /sys/class/pps/ppsX/assert
		Date: February 2008
		Contact: Rodolfo Giometti <giometti@linux.it>
		Description:
		The /sys/class/pps/ppsX/assert file reports the assert events
		and the assert sequence number of the X-th source in the form:

		<secs>.<nsec>#<sequence>

		If the source has no assert events the content of this file
		is empty.

		What: /sys/class/pps/ppsX/clear
		Date: February 2008
		Contact: Rodolfo Giometti <giometti@linux.it>
		Description:
		The /sys/class/pps/ppsX/clear file reports the clear events
		and the clear sequence number of the X-th source in the form:

		<secs>.<nsec>#<sequence>

		If the source has no clear events the content of this file
		is empty.

		What: /sys/class/pps/ppsX/mode
		Date: February 2008
		Contact: Rodolfo Giometti <giometti@linux.it>
		Description:
		The /sys/class/pps/ppsX/mode file reports the functioning
		mode of the X-th source in hexadecimal encoding.

		Please, refer to linux/include/linux/pps.h for further
		info.

		What: /sys/class/pps/ppsX/echo
		Date: February 2008
		Contact: Rodolfo Giometti <giometti@linux.it>
		Description:
		The /sys/class/pps/ppsX/echo file reports if the X-th does
		or does not support an "echo" function.

		What: /sys/class/pps/ppsX/name
		Date: February 2008
		Contact: Rodolfo Giometti <giometti@linux.it>
		Description:
		The /sys/class/pps/ppsX/name file reports the name of the
		X-th source.

		What: /sys/class/pps/ppsX/path
		Date: February 2008
		Contact: Rodolfo Giometti <giometti@linux.it>
		Description:
		The /sys/class/pps/ppsX/path file reports the path name of
		the device connected with the X-th source.

		If the source is not connected with any device the content
		of this file is empty.