Skip to content

Commit 27eb2c4

Browse files
dtordtor
committed
Merge branch 'next' into for-linus
Prepare first set of updates for 3.11 merge window.
2 parents 5705b8a + 67bf12c commit 27eb2c4

File tree

10,600 files changed

+645398
-375842
lines changed

Some content is hidden

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

10,600 files changed

+645398
-375842
lines changed

‎CREDITS‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,10 @@ S: Northampton
761761
S: NN1 3QT
762762
S: United Kingdom
763763

764+
N: Massimo Dal Zotto
765+
E: dz@debian.org
766+
D: i8k Dell laptop SMM driver
767+
764768
N: Uwe Dannowski
765769
E: Uwe.Dannowski@ira.uka.de
766770
W: http://i30www.ira.uka.de/~dannowsk/
@@ -1510,6 +1514,14 @@ D: Natsemi ethernet
15101514
D: Cobalt Networks (x86) support
15111515
D: This-and-That
15121516

1517+
N: Mark M. Hoffman
1518+
E: mhoffman@lightlink.com
1519+
D: asb100, lm93 and smsc47b397 hardware monitoring drivers
1520+
D: hwmon subsystem core
1521+
D: hwmon subsystem maintainer
1522+
D: i2c-sis96x and i2c-stub SMBus drivers
1523+
S: USA
1524+
15131525
N: Dirk Hohndel
15141526
E: hohndel@suse.de
15151527
D: The XFree86[tm] Project

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

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
What: /sys/block/<disk>/bcache/unregister
2+
Date: November 2010
3+
Contact: Kent Overstreet <kent.overstreet@gmail.com>
4+
Description:
5+
A write to this file causes the backing device or cache to be
6+
unregistered. If a backing device had dirty data in the cache,
7+
writeback mode is automatically disabled and all dirty data is
8+
flushed before the device is unregistered. Caches unregister
9+
all associated backing devices before unregistering themselves.
10+
11+
What: /sys/block/<disk>/bcache/clear_stats
12+
Date: November 2010
13+
Contact: Kent Overstreet <kent.overstreet@gmail.com>
14+
Description:
15+
Writing to this file resets all the statistics for the device.
16+
17+
What: /sys/block/<disk>/bcache/cache
18+
Date: November 2010
19+
Contact: Kent Overstreet <kent.overstreet@gmail.com>
20+
Description:
21+
For a backing device that has cache, a symlink to
22+
the bcache/ dir of that cache.
23+
24+
What: /sys/block/<disk>/bcache/cache_hits
25+
Date: November 2010
26+
Contact: Kent Overstreet <kent.overstreet@gmail.com>
27+
Description:
28+
For backing devices: integer number of full cache hits,
29+
counted per bio. A partial cache hit counts as a miss.
30+
31+
What: /sys/block/<disk>/bcache/cache_misses
32+
Date: November 2010
33+
Contact: Kent Overstreet <kent.overstreet@gmail.com>
34+
Description:
35+
For backing devices: integer number of cache misses.
36+
37+
What: /sys/block/<disk>/bcache/cache_hit_ratio
38+
Date: November 2010
39+
Contact: Kent Overstreet <kent.overstreet@gmail.com>
40+
Description:
41+
For backing devices: cache hits as a percentage.
42+
43+
What: /sys/block/<disk>/bcache/sequential_cutoff
44+
Date: November 2010
45+
Contact: Kent Overstreet <kent.overstreet@gmail.com>
46+
Description:
47+
For backing devices: Threshold past which sequential IO will
48+
skip the cache. Read and written as bytes in human readable
49+
units (i.e. echo 10M > sequntial_cutoff).
50+
51+
What: /sys/block/<disk>/bcache/bypassed
52+
Date: November 2010
53+
Contact: Kent Overstreet <kent.overstreet@gmail.com>
54+
Description:
55+
Sum of all reads and writes that have bypassed the cache (due
56+
to the sequential cutoff). Expressed as bytes in human
57+
readable units.
58+
59+
What: /sys/block/<disk>/bcache/writeback
60+
Date: November 2010
61+
Contact: Kent Overstreet <kent.overstreet@gmail.com>
62+
Description:
63+
For backing devices: When on, writeback caching is enabled and
64+
writes will be buffered in the cache. When off, caching is in
65+
writethrough mode; reads and writes will be added to the
66+
cache but no write buffering will take place.
67+
68+
What: /sys/block/<disk>/bcache/writeback_running
69+
Date: November 2010
70+
Contact: Kent Overstreet <kent.overstreet@gmail.com>
71+
Description:
72+
For backing devices: when off, dirty data will not be written
73+
from the cache to the backing device. The cache will still be
74+
used to buffer writes until it is mostly full, at which point
75+
writes transparently revert to writethrough mode. Intended only
76+
for benchmarking/testing.
77+
78+
What: /sys/block/<disk>/bcache/writeback_delay
79+
Date: November 2010
80+
Contact: Kent Overstreet <kent.overstreet@gmail.com>
81+
Description:
82+
For backing devices: In writeback mode, when dirty data is
83+
written to the cache and the cache held no dirty data for that
84+
backing device, writeback from cache to backing device starts
85+
after this delay, expressed as an integer number of seconds.
86+
87+
What: /sys/block/<disk>/bcache/writeback_percent
88+
Date: November 2010
89+
Contact: Kent Overstreet <kent.overstreet@gmail.com>
90+
Description:
91+
For backing devices: If nonzero, writeback from cache to
92+
backing device only takes place when more than this percentage
93+
of the cache is used, allowing more write coalescing to take
94+
place and reducing total number of writes sent to the backing
95+
device. Integer between 0 and 40.
96+
97+
What: /sys/block/<disk>/bcache/synchronous
98+
Date: November 2010
99+
Contact: Kent Overstreet <kent.overstreet@gmail.com>
100+
Description:
101+
For a cache, a boolean that allows synchronous mode to be
102+
switched on and off. In synchronous mode all writes are ordered
103+
such that the cache can reliably recover from unclean shutdown;
104+
if disabled bcache will not generally wait for writes to
105+
complete but if the cache is not shut down cleanly all data
106+
will be discarded from the cache. Should not be turned off with
107+
writeback caching enabled.
108+
109+
What: /sys/block/<disk>/bcache/discard
110+
Date: November 2010
111+
Contact: Kent Overstreet <kent.overstreet@gmail.com>
112+
Description:
113+
For a cache, a boolean allowing discard/TRIM to be turned off
114+
or back on if the device supports it.
115+
116+
What: /sys/block/<disk>/bcache/bucket_size
117+
Date: November 2010
118+
Contact: Kent Overstreet <kent.overstreet@gmail.com>
119+
Description:
120+
For a cache, bucket size in human readable units, as set at
121+
cache creation time; should match the erase block size of the
122+
SSD for optimal performance.
123+
124+
What: /sys/block/<disk>/bcache/nbuckets
125+
Date: November 2010
126+
Contact: Kent Overstreet <kent.overstreet@gmail.com>
127+
Description:
128+
For a cache, the number of usable buckets.
129+
130+
What: /sys/block/<disk>/bcache/tree_depth
131+
Date: November 2010
132+
Contact: Kent Overstreet <kent.overstreet@gmail.com>
133+
Description:
134+
For a cache, height of the btree excluding leaf nodes (i.e. a
135+
one node tree will have a depth of 0).
136+
137+
What: /sys/block/<disk>/bcache/btree_cache_size
138+
Date: November 2010
139+
Contact: Kent Overstreet <kent.overstreet@gmail.com>
140+
Description:
141+
Number of btree buckets/nodes that are currently cached in
142+
memory; cache dynamically grows and shrinks in response to
143+
memory pressure from the rest of the system.
144+
145+
What: /sys/block/<disk>/bcache/written
146+
Date: November 2010
147+
Contact: Kent Overstreet <kent.overstreet@gmail.com>
148+
Description:
149+
For a cache, total amount of data in human readable units
150+
written to the cache, excluding all metadata.
151+
152+
What: /sys/block/<disk>/bcache/btree_written
153+
Date: November 2010
154+
Contact: Kent Overstreet <kent.overstreet@gmail.com>
155+
Description:
156+
For a cache, sum of all btree writes in human readable units.

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
What: /sys/bus/mei/devices/.../modalias
2+
Date: March 2013
3+
KernelVersion: 3.10
4+
Contact: Samuel Ortiz <sameo@linux.intel.com>
5+
linux-mei@linux.intel.com
6+
Description: Stores the same MODALIAS value emitted by uevent
7+
Format: mei:<mei device name>

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -66,27 +66,7 @@ current_snap
6666

6767
The current snapshot for which the device is mapped.
6868

69-
snap_*
70-
71-
A directory per each snapshot
72-
7369
parent
7470

7571
Information identifying the pool, image, and snapshot id for
7672
the parent image in a layered rbd image (format 2 only).
77-
78-
Entries under /sys/bus/rbd/devices/<dev-id>/snap_<snap-name>
79-
-------------------------------------------------------------
80-
81-
snap_id
82-
83-
The rados internal snapshot id assigned for this snapshot
84-
85-
snap_size
86-
87-
The size of the image when this snapshot was taken.
88-
89-
snap_features
90-
91-
A hexadecimal encoding of the feature bits for this snapshot.
92-

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Date: January 2008
3232
KernelVersion: 2.6.25
3333
Contact: Sarah Sharp <sarah.a.sharp@intel.com>
3434
Description:
35-
If CONFIG_PM and CONFIG_USB_SUSPEND are enabled, then this file
35+
If CONFIG_PM_RUNTIME is enabled then this file
3636
is present. When read, it returns the total time (in msec)
3737
that the USB device has been connected to the machine. This
3838
file is read-only.
@@ -45,7 +45,7 @@ Date: January 2008
4545
KernelVersion: 2.6.25
4646
Contact: Sarah Sharp <sarah.a.sharp@intel.com>
4747
Description:
48-
If CONFIG_PM and CONFIG_USB_SUSPEND are enabled, then this file
48+
If CONFIG_PM_RUNTIME is enabled then this file
4949
is present. When read, it returns the total time (in msec)
5050
that the USB device has been active, i.e. not in a suspended
5151
state. This file is read-only.
@@ -187,7 +187,7 @@ What: /sys/bus/usb/devices/.../power/usb2_hardware_lpm
187187
Date: September 2011
188188
Contact: Andiry Xu <andiry.xu@amd.com>
189189
Description:
190-
If CONFIG_USB_SUSPEND is set and a USB 2.0 lpm-capable device
190+
If CONFIG_PM_RUNTIME is set and a USB 2.0 lpm-capable device
191191
is plugged in to a xHCI host which support link PM, it will
192192
perform a LPM test; if the test is passed and host supports
193193
USB2 hardware LPM (xHCI 1.0 feature), USB2 hardware LPM will

‎Documentation/ABI/testing/sysfs-class-mtd‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,15 @@ Description:
1414
The /sys/class/mtd/mtd{0,1,2,3,...} directories correspond
1515
to each /dev/mtdX character device. These may represent
1616
physical/simulated flash devices, partitions on a flash
17-
device, or concatenated flash devices. They exist regardless
18-
of whether CONFIG_MTD_CHAR is actually enabled.
17+
device, or concatenated flash devices.
1918

2019
What: /sys/class/mtd/mtdXro/
2120
Date: April 2009
2221
KernelVersion: 2.6.29
2322
Contact: linux-mtd@lists.infradead.org
2423
Description:
2524
These directories provide the corresponding read-only device
26-
nodes for /sys/class/mtd/mtdX/ . They are only created
27-
(for the benefit of udev) if CONFIG_MTD_CHAR is enabled.
25+
nodes for /sys/class/mtd/mtdX/ .
2826

2927
What: /sys/class/mtd/mtdX/dev
3028
Date: April 2009

‎Documentation/ABI/testing/sysfs-class-net-mesh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,14 @@ Description:
6767
Defines the penalty which will be applied to an
6868
originator message's tq-field on every hop.
6969

70+
What: /sys/class/net/<mesh_iface>/mesh/network_coding
71+
Date: Nov 2012
72+
Contact: Martin Hundeboll <martin@hundeboll.net>
73+
Description:
74+
Controls whether Network Coding (using some magic
75+
to send fewer wifi packets but still the same
76+
content) is enabled or not.
77+
7078
What: /sys/class/net/<mesh_iface>/mesh/orig_interval
7179
Date: May 2010
7280
Contact: Marek Lindner <lindner_marek@yahoo.de>

‎Documentation/ABI/testing/sysfs-devices-lpss_ltr‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
What: /sys/devices/.../lpss_ltr/
2+
Date: March 2013
3+
Contact: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
4+
Description:
5+
The /sys/devices/.../lpss_ltr/ directory is only present for
6+
devices included into the Intel Lynxpoint Low Power Subsystem
7+
(LPSS). If present, it contains attributes containing the LTR
8+
mode and the values of LTR registers of the device.
9+
10+
What: /sys/devices/.../lpss_ltr/ltr_mode
11+
Date: March 2013
12+
Contact: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
13+
Description:
14+
The /sys/devices/.../lpss_ltr/ltr_mode attribute contains an
15+
integer number (0 or 1) indicating whether or not the devices'
16+
LTR functionality is working in the software mode (1).
17+
18+
This attribute is read-only. If the device's runtime PM status
19+
is not "active", attempts to read from this attribute cause
20+
-EAGAIN to be returned.
21+
22+
What: /sys/devices/.../lpss_ltr/auto_ltr
23+
Date: March 2013
24+
Contact: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
25+
Description:
26+
The /sys/devices/.../lpss_ltr/auto_ltr attribute contains the
27+
current value of the device's AUTO_LTR register (raw)
28+
represented as an 8-digit hexadecimal number.
29+
30+
This attribute is read-only. If the device's runtime PM status
31+
is not "active", attempts to read from this attribute cause
32+
-EAGAIN to be returned.
33+
34+
What: /sys/devices/.../lpss_ltr/sw_ltr
35+
Date: March 2013
36+
Contact: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
37+
Description:
38+
The /sys/devices/.../lpss_ltr/auto_ltr attribute contains the
39+
current value of the device's SW_LTR register (raw) represented
40+
as an 8-digit hexadecimal number.
41+
42+
This attribute is read-only. If the device's runtime PM status
43+
is not "active", attempts to read from this attribute cause
44+
-EAGAIN to be returned.

‎Documentation/ABI/testing/sysfs-devices-power_resources_wakeup‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
What: /sys/devices/.../power_resources_wakeup/
2+
Date: April 2013
3+
Contact: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
4+
Description:
5+
The /sys/devices/.../power_resources_wakeup/ directory is only
6+
present for device objects representing ACPI device nodes that
7+
require ACPI power resources for wakeup signaling.
8+
9+
If present, it contains symbolic links to device directories
10+
representing ACPI power resources that need to be turned on for
11+
the given device node to be able to signal wakeup. The names of
12+
the links are the same as the names of the directories they
13+
point to.

‎Documentation/ABI/testing/sysfs-devices-system-cpu‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,3 +173,15 @@ Description: Processor frequency boosting control
173173
Boosting allows the CPU and the firmware to run at a frequency
174174
beyound it's nominal limit.
175175
More details can be found in Documentation/cpu-freq/boost.txt
176+
177+
178+
What: /sys/devices/system/cpu/cpu#/crash_notes
179+
/sys/devices/system/cpu/cpu#/crash_notes_size
180+
Date: April 2013
181+
Contact: kexec@lists.infradead.org
182+
Description: address and size of the percpu note.
183+
184+
crash_notes: the physical address of the memory that holds the
185+
note of cpu#.
186+
187+
crash_notes_size: size of the note of cpu#.

0 commit comments

Comments
 (0)