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

Commit c87985a3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tty-next into 3.6-rc1 



This handles the merge issue in:
	arch/um/drivers/line.c
	arch/um/drivers/line.h
And resolves the duplicate patches that were in both trees do to the
tty-next branch not getting merged into 3.6-rc1.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents d155255a 0d7614f0

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

0 → 100644
+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.

Documentation/ABI/stable/sysfs-bus-firewire

+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

Documentation/ABI/stable/sysfs-driver-w1_ds28e04

0 → 100644
+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

Documentation/ABI/testing/dev-kmsg

+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

Documentation/ABI/testing/sysfs-bus-iio

+28 −26
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ Contact: linux-iio@vger.kernel.org 
Description:

		Some devices have internal clocks.  This parameter sets the

		resulting sampling frequency.  In many devices this

		parameter has an effect on input filters etc rather than

		parameter has an effect on input filters etc. rather than

		simply controlling when the input is sampled.  As this

		effects datardy triggers, hardware buffers and the sysfs

		effects data ready triggers, hardware buffers and the sysfs

		direct access interfaces, it may be found in any of the

		relevant directories.  If it effects all of the above

		then it is to be found in the base device directory.
@@ -74,7 +74,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_raw 
KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:

		Raw (unscaled no bias removal etc) voltage measurement from

		Raw (unscaled no bias removal etc.) voltage measurement from

		channel Y. In special cases where the channel does not

		correspond to externally available input one of the named

		versions may be used. The number must always be specified and
@@ -118,11 +118,11 @@ What: /sys/bus/iio/devices/iio:deviceX/in_temp_z_raw 
KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:

		Raw (unscaled no bias removal etc) temperature measurement.

		Raw (unscaled no bias removal etc.) temperature measurement.

		If an axis is specified it generally means that the temperature

		sensor is associated with one part of a compound device (e.g.

		a gyroscope axis). Units after application of scale and offset

		are milli degrees Celsuis.

		are milli degrees Celsius.



What:		/sys/bus/iio/devices/iio:deviceX/in_tempX_input

KernelVersion:	2.6.38
@@ -148,10 +148,9 @@ KernelVersion: 2.6.35 
Contact:	linux-iio@vger.kernel.org

Description:

		Angular velocity about axis x, y or z (may be arbitrarily

		assigned) Data converted by application of offset then scale to

		radians per second. Has all the equivalent parameters as

		per voltageY. Units after application of scale and offset are

		radians per second.

		assigned). Has all the equivalent parameters as	per voltageY.

		Units after application of scale and offset are	radians per

		second.



What:		/sys/bus/iio/devices/iio:deviceX/in_incli_x_raw

What:		/sys/bus/iio/devices/iio:deviceX/in_incli_y_raw
@@ -161,7 +160,7 @@ Contact: linux-iio@vger.kernel.org 
Description:

		Inclination raw reading about axis x, y or z (may be

		arbitrarily assigned). Data converted by application of offset

		and scale to Degrees.

		and scale to degrees.



What:		/sys/bus/iio/devices/iio:deviceX/in_magn_x_raw

What:		/sys/bus/iio/devices/iio:deviceX/in_magn_y_raw
@@ -203,7 +202,7 @@ Contact: linux-iio@vger.kernel.org 
Description:

		If known for a device, offset to be added to <type>[Y]_raw prior

		to scaling by <type>[Y]_scale in order to obtain value in the

		<type> units as specified in <type>[y]_raw documentation.

		<type> units as specified in <type>[Y]_raw documentation.

		Not present if the offset is always 0 or unknown. If Y or

		axis <x|y|z> is not present, then the offset applies to all

		in channels of <type>.
@@ -249,7 +248,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_calibbias 
KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:

		Hardware applied calibration offset. (assumed to fix production

		Hardware applied calibration offset (assumed to fix production

		inaccuracies).



What		/sys/bus/iio/devices/iio:deviceX/in_voltageY_calibscale
@@ -266,7 +265,7 @@ what /sys/bus/iio/devices/iio:deviceX/in_proximity0_calibscale 
KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:

		Hardware applied calibration scale factor. (assumed to fix

		Hardware applied calibration scale factor (assumed to fix

		production inaccuracies).  If shared across all channels,

		<type>_calibscale is used.
@@ -276,10 +275,10 @@ What: /sys/.../iio:deviceX/in_voltage-voltage_scale_available 
What:		/sys/.../iio:deviceX/out_voltageX_scale_available

What:		/sys/.../iio:deviceX/out_altvoltageX_scale_available

What:		/sys/.../iio:deviceX/in_capacitance_scale_available

KernelVersion:	2.635

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:

		If a discrete set of scale values are available, they

		If a discrete set of scale values is available, they

		are listed in this attribute.



What		/sys/bus/iio/devices/iio:deviceX/out_voltageY_hardwaregain
@@ -330,9 +329,11 @@ Contact: linux-iio@vger.kernel.org 
Description:

		Specifies the output powerdown mode.

		DAC output stage is disconnected from the amplifier and

		1kohm_to_gnd: connected to ground via an 1kOhm resistor

		100kohm_to_gnd: connected to ground via an 100kOhm resistor

		three_state: left floating

		1kohm_to_gnd: connected	to ground via an 1kOhm resistor,

		6kohm_to_gnd: connected to ground via a 6kOhm resistor,

		20kohm_to_gnd: connected to ground via a 20kOhm resistor,

		100kohm_to_gnd: connected to ground via an 100kOhm resistor,

		three_state: left floating.

		For a list of available output power down options read

		outX_powerdown_mode_available. If Y is not present the

		mode is shared across all outputs.
@@ -355,9 +356,10 @@ KernelVersion: 2.6.38 
Contact:	linux-iio@vger.kernel.org

Description:

		Writing 1 causes output Y to enter the power down mode specified

		by the corresponding outY_powerdown_mode. Clearing returns to

		normal operation. Y may be suppressed if all outputs are

		controlled together.

		by the corresponding outY_powerdown_mode. DAC output stage is

		disconnected from the amplifier. Clearing returns to normal

		operation. Y may be suppressed if all outputs are controlled

		together.



What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_frequency

KernelVersion:	3.4.0
@@ -421,12 +423,12 @@ Description: 
		different values, but the device can only enable both thresholds

		or neither.

		Note the driver will assume the last p events requested are

		to be enabled where p is however many it supports (which may

		vary depending on the exact set requested. So if you want to be

		to be enabled where p is how many it supports (which may vary

		depending on the exact set requested. So if you want to be

		sure you have set what you think you have, check the contents of

		these attributes after everything is configured. Drivers may

		have to buffer any parameters so that they are consistent when

		a given event type is enabled a future point (and not those for

		a given event type is enabled at a future point (and not those for

		whatever event was previously enabled).



What:		/sys/.../iio:deviceX/events/in_accel_x_roc_rising_en
@@ -702,7 +704,7 @@ What: /sys/.../buffer/scan_elements/in_anglvel_type 
What:		/sys/.../buffer/scan_elements/in_magn_type

What:		/sys/.../buffer/scan_elements/in_incli_type

What:		/sys/.../buffer/scan_elements/in_voltageY_type

What:		/sys/.../buffer/scan_elements/in_voltage-in_type

What:		/sys/.../buffer/scan_elements/in_voltage_type

What:		/sys/.../buffer/scan_elements/in_voltageY_supply_type

What:		/sys/.../buffer/scan_elements/in_timestamp_type

KernelVersion:	2.6.37
@@ -723,7 +725,7 @@ Description: 
		the buffer output value appropriately.  The storagebits value

		also specifies the data alignment.  So s48/64>>2 will be a

		signed 48 bit integer stored in a 64 bit location aligned to

		a a64 bit boundary. To obtain the clean value, shift right 2

		a 64 bit boundary. To obtain the clean value, shift right 2

		and apply a mask to zero the top 16 bits of the result.

		For other storage combinations this attribute will be extended

		appropriately.