Skip to content

Commit 51b743f

Browse files
author
James Morris
committed
Merge tag 'v3.6-rc2' into next
Linux 3.6-rc2 Resync with Linus.
2 parents 9f99798 + d987569 commit 51b743f

File tree

8,377 files changed

+520852
-246145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

8,377 files changed

+520852
-246145
lines changed

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
111111
Uwe Kleine-König <ukl@pengutronix.de>
112112
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
113113
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
114+
Viresh Kumar <viresh.linux@gmail.com> <viresh.kumar@st.com>
114115
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
115116
Yusuke Goda <goda.yusuke@renesas.com>
116117
Gustavo Padovan <gustavo@las.ic.unicamp.br>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
What: /proc/sys/vm/nr_pdflush_threads
2+
Date: June 2012
3+
Contact: Wanpeng Li <liwp@linux.vnet.ibm.com>
4+
Description: Since pdflush is replaced by per-BDI flusher, the interface of old pdflush
5+
exported in /proc/sys/vm/ should be removed.

‎Documentation/ABI/stable/sysfs-bus-firewire

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,17 @@ Users: udev rules to set ownership and access permissions or ACLs of
3939
/dev/fw[0-9]+ character device files
4040

4141

42+
What: /sys/bus/firewire/devices/fw[0-9]+/is_local
43+
Date: July 2012
44+
KernelVersion: 3.6
45+
Contact: linux1394-devel@lists.sourceforge.net
46+
Description:
47+
IEEE 1394 node device attribute.
48+
Read-only and immutable.
49+
Values: 1: The sysfs entry represents a local node (a controller card).
50+
0: The sysfs entry represents a remote node.
51+
52+
4253
What: /sys/bus/firewire/devices/fw[0-9]+[.][0-9]+/
4354
Date: May 2007
4455
KernelVersion: 2.6.22

‎Documentation/ABI/stable/sysfs-driver-w1_ds28e04

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
What: /sys/bus/w1/devices/.../pio
2+
Date: May 2012
3+
Contact: Markus Franke <franm@hrz.tu-chemnitz.de>
4+
Description: read/write the contents of the two PIO's of the DS28E04-100
5+
see Documentation/w1/slaves/w1_ds28e04 for detailed information
6+
Users: any user space application which wants to communicate with DS28E04-100
7+
8+
9+
10+
What: /sys/bus/w1/devices/.../eeprom
11+
Date: May 2012
12+
Contact: Markus Franke <franm@hrz.tu-chemnitz.de>
13+
Description: read/write the contents of the EEPROM memory of the DS28E04-100
14+
see Documentation/w1/slaves/w1_ds28e04 for detailed information
15+
Users: any user space application which wants to communicate with DS28E04-100

‎Documentation/ABI/stable/vdso

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ though.
2424

2525
(As of this writing, this ABI documentation as been confirmed for x86_64.
2626
The maintainers of the other vDSO-using architectures should confirm
27-
that it is correct for their architecture.)
27+
that it is correct for their architecture.)

‎Documentation/ABI/testing/dev-kmsg

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,33 +58,44 @@ Description: The /dev/kmsg character device node provides userspace access
5858

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

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

7274
A line starting with ' ', is a continuation line, adding
7375
key/value pairs to the log message, which provide the machine
7476
readable context of the message, for reliable processing in
7577
userspace.
7678

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

8486
The DEVICE= key uniquely identifies devices the following way:
8587
b12:8 - block dev_t
8688
c127:3 - char dev_t
8789
n8 - netdev ifindex
8890
+sound:card0 - subsystem:devname
8991

92+
The flags field carries '-' by default. A 'c' indicates a
93+
fragment of a line. All following fragments are flagged with
94+
'+'. Note, that these hints about continuation lines are not
95+
neccessarily correct, and the stream could be interleaved with
96+
unrelated messages, but merging the lines in the output
97+
usually produces better human readable results. A similar
98+
logic is used internally when messages are printed to the
99+
console, /proc/kmsg or the syslog() syscall.
100+
90101
Users: dmesg(1), userspace kernel log consumers

‎Documentation/ABI/testing/sysfs-block-rssd

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,5 @@
1-
What: /sys/block/rssd*/registers
2-
Date: March 2012
3-
KernelVersion: 3.3
4-
Contact: Asai Thambi S P <asamymuthupa@micron.com>
5-
Description: This is a read-only file. Dumps below driver information and
6-
hardware registers.
7-
- S ACTive
8-
- Command Issue
9-
- Completed
10-
- PORT IRQ STAT
11-
- HOST IRQ STAT
12-
- Allocated
13-
- Commands in Q
14-
151
What: /sys/block/rssd*/status
162
Date: April 2012
173
KernelVersion: 3.4
184
Contact: Asai Thambi S P <asamymuthupa@micron.com>
195
Description: This is a read-only file. Indicates the status of the device.
20-
21-
What: /sys/block/rssd*/flags
22-
Date: May 2012
23-
KernelVersion: 3.5
24-
Contact: Asai Thambi S P <asamymuthupa@micron.com>
25-
Description: This is a read-only file. Dumps the flags in port and driver
26-
data structure

‎Documentation/ABI/testing/sysfs-block-zram

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,4 @@ Description:
9696
overhead, allocated for this disk. So, allocator space
9797
efficiency can be calculated using compr_data_size and this
9898
statistic.
99-
Unit: bytes
99+
Unit: bytes

‎Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 59 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ Contact: linux-iio@vger.kernel.org
4040
Description:
4141
Some devices have internal clocks. This parameter sets the
4242
resulting sampling frequency. In many devices this
43-
parameter has an effect on input filters etc rather than
43+
parameter has an effect on input filters etc. rather than
4444
simply controlling when the input is sampled. As this
45-
effects datardy triggers, hardware buffers and the sysfs
45+
effects data ready triggers, hardware buffers and the sysfs
4646
direct access interfaces, it may be found in any of the
4747
relevant directories. If it effects all of the above
4848
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
7474
KernelVersion: 2.6.35
7575
Contact: linux-iio@vger.kernel.org
7676
Description:
77-
Raw (unscaled no bias removal etc) voltage measurement from
77+
Raw (unscaled no bias removal etc.) voltage measurement from
7878
channel Y. In special cases where the channel does not
7979
correspond to externally available input one of the named
8080
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
118118
KernelVersion: 2.6.35
119119
Contact: linux-iio@vger.kernel.org
120120
Description:
121-
Raw (unscaled no bias removal etc) temperature measurement.
121+
Raw (unscaled no bias removal etc.) temperature measurement.
122122
If an axis is specified it generally means that the temperature
123123
sensor is associated with one part of a compound device (e.g.
124124
a gyroscope axis). Units after application of scale and offset
125-
are milli degrees Celsuis.
125+
are milli degrees Celsius.
126126

127127
What: /sys/bus/iio/devices/iio:deviceX/in_tempX_input
128128
KernelVersion: 2.6.38
@@ -148,10 +148,9 @@ KernelVersion: 2.6.35
148148
Contact: linux-iio@vger.kernel.org
149149
Description:
150150
Angular velocity about axis x, y or z (may be arbitrarily
151-
assigned) Data converted by application of offset then scale to
152-
radians per second. Has all the equivalent parameters as
153-
per voltageY. Units after application of scale and offset are
154-
radians per second.
151+
assigned). Has all the equivalent parameters as per voltageY.
152+
Units after application of scale and offset are radians per
153+
second.
155154

156155
What: /sys/bus/iio/devices/iio:deviceX/in_incli_x_raw
157156
What: /sys/bus/iio/devices/iio:deviceX/in_incli_y_raw
@@ -161,7 +160,7 @@ Contact: linux-iio@vger.kernel.org
161160
Description:
162161
Inclination raw reading about axis x, y or z (may be
163162
arbitrarily assigned). Data converted by application of offset
164-
and scale to Degrees.
163+
and scale to degrees.
165164

166165
What: /sys/bus/iio/devices/iio:deviceX/in_magn_x_raw
167166
What: /sys/bus/iio/devices/iio:deviceX/in_magn_y_raw
@@ -203,7 +202,7 @@ Contact: linux-iio@vger.kernel.org
203202
Description:
204203
If known for a device, offset to be added to <type>[Y]_raw prior
205204
to scaling by <type>[Y]_scale in order to obtain value in the
206-
<type> units as specified in <type>[y]_raw documentation.
205+
<type> units as specified in <type>[Y]_raw documentation.
207206
Not present if the offset is always 0 or unknown. If Y or
208207
axis <x|y|z> is not present, then the offset applies to all
209208
in channels of <type>.
@@ -219,6 +218,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_scale
219218
What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_scale
220219
What: /sys/bus/iio/devices/iio:deviceX/in_voltage_scale
221220
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_scale
221+
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_scale
222222
What: /sys/bus/iio/devices/iio:deviceX/in_accel_scale
223223
What: /sys/bus/iio/devices/iio:deviceX/in_accel_peak_scale
224224
What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_scale
@@ -248,7 +248,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_calibbias
248248
KernelVersion: 2.6.35
249249
Contact: linux-iio@vger.kernel.org
250250
Description:
251-
Hardware applied calibration offset. (assumed to fix production
251+
Hardware applied calibration offset (assumed to fix production
252252
inaccuracies).
253253

254254
What /sys/bus/iio/devices/iio:deviceX/in_voltageY_calibscale
@@ -265,19 +265,20 @@ what /sys/bus/iio/devices/iio:deviceX/in_proximity0_calibscale
265265
KernelVersion: 2.6.35
266266
Contact: linux-iio@vger.kernel.org
267267
Description:
268-
Hardware applied calibration scale factor. (assumed to fix
268+
Hardware applied calibration scale factor (assumed to fix
269269
production inaccuracies). If shared across all channels,
270270
<type>_calibscale is used.
271271

272272
What: /sys/bus/iio/devices/iio:deviceX/in_accel_scale_available
273273
What: /sys/.../iio:deviceX/in_voltageX_scale_available
274274
What: /sys/.../iio:deviceX/in_voltage-voltage_scale_available
275275
What: /sys/.../iio:deviceX/out_voltageX_scale_available
276+
What: /sys/.../iio:deviceX/out_altvoltageX_scale_available
276277
What: /sys/.../iio:deviceX/in_capacitance_scale_available
277-
KernelVersion: 2.635
278+
KernelVersion: 2.6.35
278279
Contact: linux-iio@vger.kernel.org
279280
Description:
280-
If a discrete set of scale values are available, they
281+
If a discrete set of scale values is available, they
281282
are listed in this attribute.
282283

283284
What /sys/bus/iio/devices/iio:deviceX/out_voltageY_hardwaregain
@@ -298,14 +299,19 @@ Description:
298299
gives the 3dB frequency of the filter in Hz.
299300

300301
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_raw
302+
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_raw
301303
KernelVersion: 2.6.37
302304
Contact: linux-iio@vger.kernel.org
303305
Description:
304306
Raw (unscaled, no bias etc.) output voltage for
305307
channel Y. The number must always be specified and
306308
unique if the output corresponds to a single channel.
309+
While DAC like devices typically use out_voltage,
310+
a continuous frequency generating device, such as
311+
a DDS or PLL should use out_altvoltage.
307312

308313
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY&Z_raw
314+
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY&Z_raw
309315
KernelVersion: 2.6.37
310316
Contact: linux-iio@vger.kernel.org
311317
Description:
@@ -316,20 +322,26 @@ Description:
316322

317323
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown_mode
318324
What: /sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown_mode
325+
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_powerdown_mode
326+
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltage_powerdown_mode
319327
KernelVersion: 2.6.38
320328
Contact: linux-iio@vger.kernel.org
321329
Description:
322330
Specifies the output powerdown mode.
323331
DAC output stage is disconnected from the amplifier and
324-
1kohm_to_gnd: connected to ground via an 1kOhm resistor
325-
100kohm_to_gnd: connected to ground via an 100kOhm resistor
326-
three_state: left floating
332+
1kohm_to_gnd: connected to ground via an 1kOhm resistor,
333+
6kohm_to_gnd: connected to ground via a 6kOhm resistor,
334+
20kohm_to_gnd: connected to ground via a 20kOhm resistor,
335+
100kohm_to_gnd: connected to ground via an 100kOhm resistor,
336+
three_state: left floating.
327337
For a list of available output power down options read
328338
outX_powerdown_mode_available. If Y is not present the
329339
mode is shared across all outputs.
330340

331341
What: /sys/.../iio:deviceX/out_votlageY_powerdown_mode_available
332342
What: /sys/.../iio:deviceX/out_voltage_powerdown_mode_available
343+
What: /sys/.../iio:deviceX/out_altvotlageY_powerdown_mode_available
344+
What: /sys/.../iio:deviceX/out_altvoltage_powerdown_mode_available
333345
KernelVersion: 2.6.38
334346
Contact: linux-iio@vger.kernel.org
335347
Description:
@@ -338,13 +350,34 @@ Description:
338350

339351
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown
340352
What: /sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown
353+
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_powerdown
354+
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltage_powerdown
341355
KernelVersion: 2.6.38
342356
Contact: linux-iio@vger.kernel.org
343357
Description:
344358
Writing 1 causes output Y to enter the power down mode specified
345-
by the corresponding outY_powerdown_mode. Clearing returns to
346-
normal operation. Y may be suppressed if all outputs are
347-
controlled together.
359+
by the corresponding outY_powerdown_mode. DAC output stage is
360+
disconnected from the amplifier. Clearing returns to normal
361+
operation. Y may be suppressed if all outputs are controlled
362+
together.
363+
364+
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_frequency
365+
KernelVersion: 3.4.0
366+
Contact: linux-iio@vger.kernel.org
367+
Description:
368+
Output frequency for channel Y in Hz. The number must always be
369+
specified and unique if the output corresponds to a single
370+
channel.
371+
372+
What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_phase
373+
KernelVersion: 3.4.0
374+
Contact: linux-iio@vger.kernel.org
375+
Description:
376+
Phase in radians of one frequency/clock output Y
377+
(out_altvoltageY) relative to another frequency/clock output
378+
(out_altvoltageZ) of the device X. The number must always be
379+
specified and unique if the output corresponds to a single
380+
channel.
348381

349382
What: /sys/bus/iio/devices/iio:deviceX/events
350383
KernelVersion: 2.6.35
@@ -390,12 +423,12 @@ Description:
390423
different values, but the device can only enable both thresholds
391424
or neither.
392425
Note the driver will assume the last p events requested are
393-
to be enabled where p is however many it supports (which may
394-
vary depending on the exact set requested. So if you want to be
426+
to be enabled where p is how many it supports (which may vary
427+
depending on the exact set requested. So if you want to be
395428
sure you have set what you think you have, check the contents of
396429
these attributes after everything is configured. Drivers may
397430
have to buffer any parameters so that they are consistent when
398-
a given event type is enabled a future point (and not those for
431+
a given event type is enabled at a future point (and not those for
399432
whatever event was previously enabled).
400433

401434
What: /sys/.../iio:deviceX/events/in_accel_x_roc_rising_en
@@ -671,7 +704,7 @@ What: /sys/.../buffer/scan_elements/in_anglvel_type
671704
What: /sys/.../buffer/scan_elements/in_magn_type
672705
What: /sys/.../buffer/scan_elements/in_incli_type
673706
What: /sys/.../buffer/scan_elements/in_voltageY_type
674-
What: /sys/.../buffer/scan_elements/in_voltage-in_type
707+
What: /sys/.../buffer/scan_elements/in_voltage_type
675708
What: /sys/.../buffer/scan_elements/in_voltageY_supply_type
676709
What: /sys/.../buffer/scan_elements/in_timestamp_type
677710
KernelVersion: 2.6.37
@@ -692,7 +725,7 @@ Description:
692725
the buffer output value appropriately. The storagebits value
693726
also specifies the data alignment. So s48/64>>2 will be a
694727
signed 48 bit integer stored in a 64 bit location aligned to
695-
a a64 bit boundary. To obtain the clean value, shift right 2
728+
a 64 bit boundary. To obtain the clean value, shift right 2
696729
and apply a mask to zero the top 16 bits of the result.
697730
For other storage combinations this attribute will be extended
698731
appropriately.

0 commit comments

Comments
 (0)