Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus (f0b433e9) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads

0 → 100644

+5 −0

Original line number	Original line	Diff line number	Diff line
			What: /proc/sys/vm/nr_pdflush_threads
			Date: June 2012
			Contact: Wanpeng Li <liwp@linux.vnet.ibm.com>
			Description: Since pdflush is replaced by per-BDI flusher, the interface of old pdflush
			exported in /proc/sys/vm/ should be removed.

Documentation/ABI/stable/sysfs-bus-firewire

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -39,6 +39,17 @@ Users: udev rules to set ownership and access permissions or ACLs of
	/dev/fw[0-9]+ character device files		/dev/fw[0-9]+ character device files


			What: /sys/bus/firewire/devices/fw[0-9]+/is_local
			Date: July 2012
			KernelVersion: 3.6
			Contact: linux1394-devel@lists.sourceforge.net
			Description:
			IEEE 1394 node device attribute.
			Read-only and immutable.
			Values: 1: The sysfs entry represents a local node (a controller card).
			0: The sysfs entry represents a remote node.


	What: /sys/bus/firewire/devices/fw[0-9]+[.][0-9]+/		What: /sys/bus/firewire/devices/fw[0-9]+[.][0-9]+/
	Date: May 2007		Date: May 2007
	KernelVersion: 2.6.22		KernelVersion: 2.6.22

Documentation/ABI/stable/sysfs-driver-w1_ds28e04

0 → 100644

+15 −0

Original line number	Original line	Diff line number	Diff line
			What: /sys/bus/w1/devices/.../pio
			Date: May 2012
			Contact: Markus Franke <franm@hrz.tu-chemnitz.de>
			Description: read/write the contents of the two PIO's of the DS28E04-100
			see Documentation/w1/slaves/w1_ds28e04 for detailed information
			Users: any user space application which wants to communicate with DS28E04-100



			What: /sys/bus/w1/devices/.../eeprom
			Date: May 2012
			Contact: Markus Franke <franm@hrz.tu-chemnitz.de>
			Description: read/write the contents of the EEPROM memory of the DS28E04-100
			see Documentation/w1/slaves/w1_ds28e04 for detailed information
			Users: any user space application which wants to communicate with DS28E04-100

Documentation/ABI/testing/dev-kmsg

+20 −9

Original line number	Original line	Diff line number	Diff line
	@@ -58,16 +58,18 @@ Description: The /dev/kmsg character device node provides userspace access

	The output format consists of a prefix carrying the syslog		The output format consists of a prefix carrying the syslog
	prefix including priority and facility, the 64 bit message		prefix including priority and facility, the 64 bit message
	sequence number and the monotonic timestamp in microseconds.		sequence number and the monotonic timestamp in microseconds,
	The values are separated by a ','. Future extensions might		and a flag field. All fields are separated by a ','.
	add more comma separated values before the terminating ';'.
	Unknown values should be gracefully ignored.		Future extensions might add more comma separated values before
			the terminating ';'. Unknown fields and values should be
			gracefully ignored.

	The human readable text string starts directly after the ';'		The human readable text string starts directly after the ';'
	and is terminated by a '\n'. Untrusted values derived from		and is terminated by a '\n'. Untrusted values derived from
	hardware or other facilities are printed, therefore		hardware or other facilities are printed, therefore
	all non-printable characters in the log message are escaped		all non-printable characters and '\' itself in the log message
	by "\x00" C-style hex encoding.		are escaped by "\x00" C-style hex encoding.

	A line starting with ' ', is a continuation line, adding		A line starting with ' ', is a continuation line, adding
	key/value pairs to the log message, which provide the machine		key/value pairs to the log message, which provide the machine
	@@ -75,11 +77,11 @@ Description: The /dev/kmsg character device node provides userspace access
	userspace.		userspace.

	Example:		Example:
	7,160,424069;pci_root PNP0A03:00: host bridge window [io 0x0000-0x0cf7] (ignored)		7,160,424069,-;pci_root PNP0A03:00: host bridge window [io 0x0000-0x0cf7] (ignored)
	SUBSYSTEM=acpi		SUBSYSTEM=acpi
	DEVICE=+acpi:PNP0A03:00		DEVICE=+acpi:PNP0A03:00
	6,339,5140900;NET: Registered protocol family 10		6,339,5140900,-;NET: Registered protocol family 10
	30,340,5690716;udevd[80]: starting version 181		30,340,5690716,-;udevd[80]: starting version 181

	The DEVICE= key uniquely identifies devices the following way:		The DEVICE= key uniquely identifies devices the following way:
	b12:8 - block dev_t		b12:8 - block dev_t
	@@ -87,4 +89,13 @@ Description: The /dev/kmsg character device node provides userspace access
	n8 - netdev ifindex		n8 - netdev ifindex
	+sound:card0 - subsystem:devname		+sound:card0 - subsystem:devname

			The flags field carries '-' by default. A 'c' indicates a
			fragment of a line. All following fragments are flagged with
			'+'. Note, that these hints about continuation lines are not
			neccessarily correct, and the stream could be interleaved with
			unrelated messages, but merging the lines in the output
			usually produces better human readable results. A similar
			logic is used internally when messages are printed to the
			console, /proc/kmsg or the syslog() syscall.

	Users: dmesg(1), userspace kernel log consumers		Users: dmesg(1), userspace kernel log consumers

Documentation/ABI/testing/sysfs-block-rssd

+0 −21

Original line number	Original line	Diff line number	Diff line
	What: /sys/block/rssd*/registers
	Date: March 2012
	KernelVersion: 3.3
	Contact: Asai Thambi S P <asamymuthupa@micron.com>
	Description: This is a read-only file. Dumps below driver information and
	hardware registers.
	- S ACTive
	- Command Issue
	- Completed
	- PORT IRQ STAT
	- HOST IRQ STAT
	- Allocated
	- Commands in Q

	What: /sys/block/rssd*/status		What: /sys/block/rssd*/status
	Date: April 2012		Date: April 2012
	KernelVersion: 3.4		KernelVersion: 3.4
	Contact: Asai Thambi S P <asamymuthupa@micron.com>		Contact: Asai Thambi S P <asamymuthupa@micron.com>
	Description: This is a read-only file. Indicates the status of the device.		Description: This is a read-only file. Indicates the status of the device.

	What: /sys/block/rssd*/flags
	Date: May 2012
	KernelVersion: 3.5
	Contact: Asai Thambi S P <asamymuthupa@micron.com>
	Description: This is a read-only file. Dumps the flags in port and driver
	data structure