Skip to content

Commit 282f445

Browse files
author
H. Peter Anvin
committed
Merge remote-tracking branch 'linus/master' into x86/urgent
2 parents 68f30fb + 90a4c0f commit 282f445

File tree

9,633 files changed

+481250
-276697
lines changed

Some content is hidden

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

9,633 files changed

+481250
-276697
lines changed

‎CREDITS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,11 @@ S: Bessemerstraat 21
514514
S: Amsterdam
515515
S: The Netherlands
516516

517+
N: NeilBrown
518+
E: [email protected]
519+
P: 4096R/566281B9 1BC6 29EB D390 D870 7B5F 497A 39EC 9EDD 5662 81B9
520+
D: NFSD Maintainer 2000-2007
521+
517522
N: Zach Brown
518523
E: [email protected]
519524
D: maestro pci sound

‎Documentation/ABI/stable/sysfs-bus-xen-backend

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
What: /sys/bus/xen-backend/devices/*/devtype
2+
Date: Feb 2009
3+
KernelVersion: 2.6.38
4+
Contact: Konrad Rzeszutek Wilk <[email protected]>
5+
Description:
6+
The type of the device. e.g., one of: 'vbd' (block),
7+
'vif' (network), or 'vfb' (framebuffer).
8+
9+
What: /sys/bus/xen-backend/devices/*/nodename
10+
Date: Feb 2009
11+
KernelVersion: 2.6.38
12+
Contact: Konrad Rzeszutek Wilk <[email protected]>
13+
Description:
14+
XenStore node (under /local/domain/NNN/) for this
15+
backend device.
16+
17+
What: /sys/bus/xen-backend/devices/vbd-*/physical_device
18+
Date: April 2011
19+
KernelVersion: 3.0
20+
Contact: Konrad Rzeszutek Wilk <[email protected]>
21+
Description:
22+
The major:minor number (in hexidecimal) of the
23+
physical device providing the storage for this backend
24+
block device.
25+
26+
What: /sys/bus/xen-backend/devices/vbd-*/mode
27+
Date: April 2011
28+
KernelVersion: 3.0
29+
Contact: Konrad Rzeszutek Wilk <[email protected]>
30+
Description:
31+
Whether the block device is read-only ('r') or
32+
read-write ('w').
33+
34+
What: /sys/bus/xen-backend/devices/vbd-*/statistics/f_req
35+
Date: April 2011
36+
KernelVersion: 3.0
37+
Contact: Konrad Rzeszutek Wilk <[email protected]>
38+
Description:
39+
Number of flush requests from the frontend.
40+
41+
What: /sys/bus/xen-backend/devices/vbd-*/statistics/oo_req
42+
Date: April 2011
43+
KernelVersion: 3.0
44+
Contact: Konrad Rzeszutek Wilk <[email protected]>
45+
Description:
46+
Number of requests delayed because the backend was too
47+
busy processing previous requests.
48+
49+
What: /sys/bus/xen-backend/devices/vbd-*/statistics/rd_req
50+
Date: April 2011
51+
KernelVersion: 3.0
52+
Contact: Konrad Rzeszutek Wilk <[email protected]>
53+
Description:
54+
Number of read requests from the frontend.
55+
56+
What: /sys/bus/xen-backend/devices/vbd-*/statistics/rd_sect
57+
Date: April 2011
58+
KernelVersion: 3.0
59+
Contact: Konrad Rzeszutek Wilk <[email protected]>
60+
Description:
61+
Number of sectors read by the frontend.
62+
63+
What: /sys/bus/xen-backend/devices/vbd-*/statistics/wr_req
64+
Date: April 2011
65+
KernelVersion: 3.0
66+
Contact: Konrad Rzeszutek Wilk <[email protected]>
67+
Description:
68+
Number of write requests from the frontend.
69+
70+
What: /sys/bus/xen-backend/devices/vbd-*/statistics/wr_sect
71+
Date: April 2011
72+
KernelVersion: 3.0
73+
Contact: Konrad Rzeszutek Wilk <[email protected]>
74+
Description:
75+
Number of sectors written by the frontend.

‎Documentation/ABI/stable/sysfs-devices-system-xen_memory

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
What: /sys/devices/system/xen_memory/xen_memory0/max_retry_count
2+
Date: May 2011
3+
KernelVersion: 2.6.39
4+
Contact: Konrad Rzeszutek Wilk <[email protected]>
5+
Description:
6+
The maximum number of times the balloon driver will
7+
attempt to increase the balloon before giving up. See
8+
also 'retry_count' below.
9+
A value of zero means retry forever and is the default one.
10+
11+
What: /sys/devices/system/xen_memory/xen_memory0/max_schedule_delay
12+
Date: May 2011
13+
KernelVersion: 2.6.39
14+
Contact: Konrad Rzeszutek Wilk <[email protected]>
15+
Description:
16+
The limit that 'schedule_delay' (see below) will be
17+
increased to. The default value is 32 seconds.
18+
19+
What: /sys/devices/system/xen_memory/xen_memory0/retry_count
20+
Date: May 2011
21+
KernelVersion: 2.6.39
22+
Contact: Konrad Rzeszutek Wilk <[email protected]>
23+
Description:
24+
The current number of times that the balloon driver
25+
has attempted to increase the size of the balloon.
26+
The default value is one. With max_retry_count being
27+
zero (unlimited), this means that the driver will attempt
28+
to retry with a 'schedule_delay' delay.
29+
30+
What: /sys/devices/system/xen_memory/xen_memory0/schedule_delay
31+
Date: May 2011
32+
KernelVersion: 2.6.39
33+
Contact: Konrad Rzeszutek Wilk <[email protected]>
34+
Description:
35+
The time (in seconds) to wait between attempts to
36+
increase the balloon. Each time the balloon cannot be
37+
increased, 'schedule_delay' is increased (until
38+
'max_schedule_delay' is reached at which point it
39+
will use the max value).
40+
41+
What: /sys/devices/system/xen_memory/xen_memory0/target
42+
Date: April 2008
43+
KernelVersion: 2.6.26
44+
Contact: Konrad Rzeszutek Wilk <[email protected]>
45+
Description:
46+
The target number of pages to adjust this domain's
47+
memory reservation to.
48+
49+
What: /sys/devices/system/xen_memory/xen_memory0/target_kb
50+
Date: April 2008
51+
KernelVersion: 2.6.26
52+
Contact: Konrad Rzeszutek Wilk <[email protected]>
53+
Description:
54+
As target above, except the value is in KiB.
55+
56+
What: /sys/devices/system/xen_memory/xen_memory0/info/current_kb
57+
Date: April 2008
58+
KernelVersion: 2.6.26
59+
Contact: Konrad Rzeszutek Wilk <[email protected]>
60+
Description:
61+
Current size (in KiB) of this domain's memory
62+
reservation.
63+
64+
What: /sys/devices/system/xen_memory/xen_memory0/info/high_kb
65+
Date: April 2008
66+
KernelVersion: 2.6.26
67+
Contact: Konrad Rzeszutek Wilk <[email protected]>
68+
Description:
69+
Amount (in KiB) of high memory in the balloon.
70+
71+
What: /sys/devices/system/xen_memory/xen_memory0/info/low_kb
72+
Date: April 2008
73+
KernelVersion: 2.6.26
74+
Contact: Konrad Rzeszutek Wilk <[email protected]>
75+
Description:
76+
Amount (in KiB) of low (or normal) memory in the
77+
balloon.

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,24 @@ Description:
6666
re-discover previously removed devices.
6767
Depends on CONFIG_HOTPLUG.
6868

69+
What: /sys/bus/pci/devices/.../msi_irqs/
70+
Date: September, 2011
71+
Contact: Neil Horman <[email protected]>
72+
Description:
73+
The /sys/devices/.../msi_irqs directory contains a variable set
74+
of sub-directories, with each sub-directory being named after a
75+
corresponding msi irq vector allocated to that device. Each
76+
numbered sub-directory N contains attributes of that irq.
77+
Note that this directory is not created for device drivers which
78+
do not support msi irqs
79+
80+
What: /sys/bus/pci/devices/.../msi_irqs/<N>/mode
81+
Date: September 2011
82+
Contact: Neil Horman <[email protected]>
83+
Description:
84+
This attribute indicates the mode that the irq vector named by
85+
the parent directory is in (msi vs. msix)
86+
6987
What: /sys/bus/pci/devices/.../remove
7088
Date: January 2009
7189
Contact: Linux PCI developers <[email protected]>

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,31 @@ Description:
119119
Write a 1 to force the device to disconnect
120120
(equivalent to unplugging a wired USB device).
121121

122+
What: /sys/bus/usb/drivers/.../new_id
123+
Date: October 2011
124+
Contact: [email protected]
125+
Description:
126+
Writing a device ID to this file will attempt to
127+
dynamically add a new device ID to a USB device driver.
128+
This may allow the driver to support more hardware than
129+
was included in the driver's static device ID support
130+
table at compile time. The format for the device ID is:
131+
idVendor idProduct bInterfaceClass.
132+
The vendor ID and device ID fields are required, the
133+
interface class is optional.
134+
Upon successfully adding an ID, the driver will probe
135+
for the device and attempt to bind to it. For example:
136+
# echo "8086 10f5" > /sys/bus/usb/drivers/foo/new_id
137+
138+
What: /sys/bus/usb-serial/drivers/.../new_id
139+
Date: October 2011
140+
Contact: [email protected]
141+
Description:
142+
For serial USB drivers, this attribute appears under the
143+
extra bus folder "usb-serial" in sysfs; apart from that
144+
difference, all descriptions from the entry
145+
"/sys/bus/usb/drivers/.../new_id" apply.
146+
122147
What: /sys/bus/usb/drivers/.../remove_id
123148
Date: November 2009
124149
Contact: CHENG Renquan <[email protected]>

‎Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
What: Attribute for calibrating ST-Ericsson AB8500 Real Time Clock
2+
Date: Oct 2011
3+
KernelVersion: 3.0
4+
Contact: Mark Godfrey <[email protected]>
5+
Description: The rtc_calibration attribute allows the userspace to
6+
calibrate the AB8500.s 32KHz Real Time Clock.
7+
Every 60 seconds the AB8500 will correct the RTC's value
8+
by adding to it the value of this attribute.
9+
The range of the attribute is -127 to +127 in units of
10+
30.5 micro-seconds (half-parts-per-million of the 32KHz clock)
11+
Users: The /vendor/st-ericsson/base_utilities/core/rtc_calibration
12+
daemon uses this interface.

‎Documentation/ABI/testing/sysfs-devices-platform-docg3

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
What: /sys/devices/platform/docg3/f[0-3]_dps[01]_is_keylocked
2+
Date: November 2011
3+
KernelVersion: 3.3
4+
Contact: Robert Jarzmik <[email protected]>
5+
Description:
6+
Show whether the floor (0 to 4), protection area (0 or 1) is
7+
keylocked. Each docg3 chip (or floor) has 2 protection areas,
8+
which can cover any part of it, block aligned, called DPS.
9+
The protection has information embedded whether it blocks reads,
10+
writes or both.
11+
The result is:
12+
0 -> the DPS is not keylocked
13+
1 -> the DPS is keylocked
14+
Users: None identified so far.
15+
16+
What: /sys/devices/platform/docg3/f[0-3]_dps[01]_protection_key
17+
Date: November 2011
18+
KernelVersion: 3.3
19+
Contact: Robert Jarzmik <[email protected]>
20+
Description:
21+
Enter the protection key for the floor (0 to 4), protection area
22+
(0 or 1). Each docg3 chip (or floor) has 2 protection areas,
23+
which can cover any part of it, block aligned, called DPS.
24+
The protection has information embedded whether it blocks reads,
25+
writes or both.
26+
The protection key is a string of 8 bytes (value 0-255).
27+
Entering the correct value toggle the lock, and can be observed
28+
through f[0-3]_dps[01]_is_keylocked.
29+
Possible values are:
30+
- 8 bytes
31+
Typical values are:
32+
- "00000000"
33+
- "12345678"
34+
Users: None identified so far.

‎Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/module/hid_logitech/drivers/hid:logitech/<dev>/range.
22
Date: July 2011
33
KernelVersion: 3.2
4-
Contact: Michal Mal� <[email protected]>
4+
Contact: Michal Malý <[email protected]>
55
Description: Display minimum, maximum and current range of the steering
66
wheel. Writing a value within min and max boundaries sets the
77
range of the wheel.

‎Documentation/ABI/testing/sysfs-driver-hid-multitouch

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/quirks
2+
Date: November 2011
3+
Contact: Benjamin Tissoires <[email protected]>
4+
Description: The integer value of this attribute corresponds to the
5+
quirks actually in place to handle the device's protocol.
6+
When read, this attribute returns the current settings (see
7+
MT_QUIRKS_* in hid-multitouch.c).
8+
When written this attribute change on the fly the quirks, then
9+
the protocol to handle the device.

0 commit comments

Comments
 (0)