Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c50e86ce authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

Merge tag 'v3.6-rc4'

Merge 3.6-rc4 to get latest OMAP and device tree fixes.
parents 14d33d38 4cbe5a55
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Uwe Kleine-König <ukl@pengutronix.de>
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
Viresh Kumar <viresh.linux@gmail.com> <viresh.kumar@st.com>
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
Yusuke Goda <goda.yusuke@renesas.com>
Gustavo Padovan <gustavo@las.ic.unicamp.br>
+5 −0
Original line number 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.
+11 −0
Original line number 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


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]+/
Date:		May 2007
KernelVersion:	2.6.22
+15 −0
Original line number 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
+20 −9
Original line number 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
		prefix including priority and facility, the 64 bit message
		sequence number and the monotonic timestamp in microseconds.
		The values are separated by a ','. Future extensions might
		add more comma separated values before the terminating ';'.
		Unknown values should be gracefully ignored.
		sequence number and the monotonic timestamp in microseconds,
		and a flag field. All fields are separated by a ','.

		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 ';'
		and is terminated by a '\n'. Untrusted values derived from
		hardware or other facilities are printed, therefore
		all non-printable characters in the log message are escaped
		by "\x00" C-style hex encoding.
		all non-printable characters and '\' itself in the log message
		are escaped by "\x00" C-style hex encoding.

		A line starting with ' ', is a continuation line, adding
		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.

		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
		 DEVICE=+acpi:PNP0A03:00
		6,339,5140900;NET: Registered protocol family 10
		30,340,5690716;udevd[80]: starting version 181
		6,339,5140900,-;NET: Registered protocol family 10
		30,340,5690716,-;udevd[80]: starting version 181

		The DEVICE= key uniquely identifies devices the following way:
		  b12:8        - block dev_t
@@ -87,4 +89,13 @@ Description: The /dev/kmsg character device node provides userspace access
		  n8           - netdev ifindex
		  +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
Loading