Skip to content

Commit 6eca954

Browse files
lenblenb
committed
Merge branches 'acpi_pad-bugzilla-42981', 'apei-bugzilla-43282', 'video-bugzilla-43168', 'bugzilla-40002' and 'bugfix-misc' into release
bug fixes
5 parents 5f16012 + 34ddeb0 + b037384 + f6b54f0 + 76eb9a3 commit 6eca954

File tree

9,059 files changed

+565828
-359047
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,059 files changed

+565828
-359047
lines changed

‎.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,3 +113,5 @@ Uwe Kleine-König <[email protected]>
113113
Valdis Kletnieks <[email protected]>
114114
Takashi YOSHII <[email protected]>
115115
Yusuke Goda <[email protected]>
116+
Gustavo Padovan <[email protected]>
117+
Gustavo Padovan <[email protected]>

‎CREDITS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3814,8 +3814,8 @@ D: INFO-SHEET, former maintainer
38143814
D: Author of the longest-living linux bug
38153815

38163816
N: Jonathan Woithe
3817-
E: jwoithe@physics.adelaide.edu.au
3818-
W: http://www.physics.adelaide.edu.au/~jwoithe
3817+
E: jwoithe@just42.net
3818+
W: http:/www.just42.net/jwoithe
38193819
D: ALS-007 sound card extensions to Sound Blaster driver
38203820
S: 20 Jordan St
38213821
S: Valley View, SA 5093

‎Documentation/00-INDEX

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,6 @@ m68k/
218218
- directory with info about Linux on Motorola 68k architecture.
219219
magic-number.txt
220220
- list of magic numbers used to mark/protect kernel data structures.
221-
mca.txt
222-
- info on supporting Micro Channel Architecture (e.g. PS/2) systems.
223221
md.txt
224222
- info on boot arguments for the multiple devices driver.
225223
memory-barriers.txt

‎Documentation/ABI/removed/ip_queue

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
What: ip_queue
2+
Date: finally removed in kernel v3.5.0
3+
Contact: Pablo Neira Ayuso <[email protected]>
4+
Description:
5+
ip_queue has been replaced by nfnetlink_queue which provides
6+
more advanced queueing mechanism to user-space. The ip_queue
7+
module was already announced to become obsolete years ago.
8+
9+
Users:

‎Documentation/ABI/testing/debugfs-pfo-nx-crypto

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
What: /sys/kernel/debug/nx-crypto/*
2+
Date: March 2012
3+
KernelVersion: 3.4
4+
Contact: Kent Yoder <[email protected]>
5+
Description:
6+
7+
These debugfs interfaces are built by the nx-crypto driver, built in
8+
arch/powerpc/crypto/nx.
9+
10+
Error Detection
11+
===============
12+
13+
errors:
14+
- A u32 providing a total count of errors since the driver was loaded. The
15+
only errors counted here are those returned from the hcall, H_COP_OP.
16+
17+
last_error:
18+
- The most recent non-zero return code from the H_COP_OP hcall. -EBUSY is not
19+
recorded here (the hcall will retry until -EBUSY goes away).
20+
21+
last_error_pid:
22+
- The process ID of the process who received the most recent error from the
23+
hcall.
24+
25+
Device Use
26+
==========
27+
28+
aes_bytes:
29+
- The total number of bytes encrypted using AES in any of the driver's
30+
supported modes.
31+
32+
aes_ops:
33+
- The total number of AES operations submitted to the hardware.
34+
35+
sha256_bytes:
36+
- The total number of bytes hashed by the hardware using SHA-256.
37+
38+
sha256_ops:
39+
- The total number of SHA-256 operations submitted to the hardware.
40+
41+
sha512_bytes:
42+
- The total number of bytes hashed by the hardware using SHA-512.
43+
44+
sha512_ops:
45+
- The total number of SHA-512 operations submitted to the hardware.

‎Documentation/ABI/testing/dev-kmsg

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
What: /dev/kmsg
2+
Date: Mai 2012
3+
KernelVersion: 3.5
4+
Contact: Kay Sievers <[email protected]>
5+
Description: The /dev/kmsg character device node provides userspace access
6+
to the kernel's printk buffer.
7+
8+
Injecting messages:
9+
Every write() to the opened device node places a log entry in
10+
the kernel's printk buffer.
11+
12+
The logged line can be prefixed with a <N> syslog prefix, which
13+
carries the syslog priority and facility. The single decimal
14+
prefix number is composed of the 3 lowest bits being the syslog
15+
priority and the higher bits the syslog facility number.
16+
17+
If no prefix is given, the priority number is the default kernel
18+
log priority and the facility number is set to LOG_USER (1). It
19+
is not possible to inject messages from userspace with the
20+
facility number LOG_KERN (0), to make sure that the origin of
21+
the messages can always be reliably determined.
22+
23+
Accessing the buffer:
24+
Every read() from the opened device node receives one record
25+
of the kernel's printk buffer.
26+
27+
The first read() directly following an open() always returns
28+
first message in the buffer; there is no kernel-internal
29+
persistent state; many readers can concurrently open the device
30+
and read from it, without affecting other readers.
31+
32+
Every read() will receive the next available record. If no more
33+
records are available read() will block, or if O_NONBLOCK is
34+
used -EAGAIN returned.
35+
36+
Messages in the record ring buffer get overwritten as whole,
37+
there are never partial messages received by read().
38+
39+
In case messages get overwritten in the circular buffer while
40+
the device is kept open, the next read() will return -EPIPE,
41+
and the seek position be updated to the next available record.
42+
Subsequent reads() will return available records again.
43+
44+
Unlike the classic syslog() interface, the 64 bit record
45+
sequence numbers allow to calculate the amount of lost
46+
messages, in case the buffer gets overwritten. And they allow
47+
to reconnect to the buffer and reconstruct the read position
48+
if needed, without limiting the interface to a single reader.
49+
50+
The device supports seek with the following parameters:
51+
SEEK_SET, 0
52+
seek to the first entry in the buffer
53+
SEEK_END, 0
54+
seek after the last entry in the buffer
55+
SEEK_DATA, 0
56+
seek after the last record available at the time
57+
the last SYSLOG_ACTION_CLEAR was issued.
58+
59+
The output format consists of a prefix carrying the syslog
60+
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.
65+
66+
The human readable text string starts directly after the ';'
67+
and is terminated by a '\n'. Untrusted values derived from
68+
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+
72+
A line starting with ' ', is a continuation line, adding
73+
key/value pairs to the log message, which provide the machine
74+
readable context of the message, for reliable processing in
75+
userspace.
76+
77+
Example:
78+
7,160,424069;pci_root PNP0A03:00: host bridge window [io 0x0000-0x0cf7] (ignored)
79+
SUBSYSTEM=acpi
80+
DEVICE=+acpi:PNP0A03:00
81+
6,339,5140900;NET: Registered protocol family 10
82+
30,340,5690716;udevd[80]: starting version 181
83+
84+
The DEVICE= key uniquely identifies devices the following way:
85+
b12:8 - block dev_t
86+
c127:3 - char dev_t
87+
n8 - netdev ifindex
88+
+sound:card0 - subsystem:devname
89+
90+
Users: dmesg(1), userspace kernel log consumers

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,21 @@ Description: This is a read-only file. Dumps below driver information and
66
hardware registers.
77
- S ACTive
88
- Command Issue
9-
- Allocated
109
- Completed
1110
- PORT IRQ STAT
1211
- HOST IRQ STAT
12+
- Allocated
13+
- Commands in Q
1314

1415
What: /sys/block/rssd*/status
1516
Date: April 2012
1617
KernelVersion: 3.4
1718
Contact: Asai Thambi S P <[email protected]>
18-
Description: This is a read-only file. Indicates the status of the device.
19+
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 <[email protected]>
25+
Description: This is a read-only file. Dumps the flags in port and driver
26+
data structure

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

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
What: /sys/bus/fcoe/ctlr_X
2+
Date: March 2012
3+
KernelVersion: TBD
4+
Contact: Robert Love <[email protected]>, [email protected]
5+
Description: 'FCoE Controller' instances on the fcoe bus
6+
Attributes:
7+
8+
fcf_dev_loss_tmo: Device loss timeout peroid (see below). Changing
9+
this value will change the dev_loss_tmo for all
10+
FCFs discovered by this controller.
11+
12+
lesb_link_fail: Link Error Status Block (LESB) link failure count.
13+
14+
lesb_vlink_fail: Link Error Status Block (LESB) virtual link
15+
failure count.
16+
17+
lesb_miss_fka: Link Error Status Block (LESB) missed FCoE
18+
Initialization Protocol (FIP) Keep-Alives (FKA).
19+
20+
lesb_symb_err: Link Error Status Block (LESB) symbolic error count.
21+
22+
lesb_err_block: Link Error Status Block (LESB) block error count.
23+
24+
lesb_fcs_error: Link Error Status Block (LESB) Fibre Channel
25+
Serivces error count.
26+
27+
Notes: ctlr_X (global increment starting at 0)
28+
29+
What: /sys/bus/fcoe/fcf_X
30+
Date: March 2012
31+
KernelVersion: TBD
32+
Contact: Robert Love <[email protected]>, [email protected]
33+
Description: 'FCoE FCF' instances on the fcoe bus. A FCF is a Fibre Channel
34+
Forwarder, which is a FCoE switch that can accept FCoE
35+
(Ethernet) packets, unpack them, and forward the embedded
36+
Fibre Channel frames into a FC fabric. It can also take
37+
outbound FC frames and pack them in Ethernet packets to
38+
be sent to their destination on the Ethernet segment.
39+
Attributes:
40+
41+
fabric_name: Identifies the fabric that the FCF services.
42+
43+
switch_name: Identifies the FCF.
44+
45+
priority: The switch's priority amongst other FCFs on the same
46+
fabric.
47+
48+
selected: 1 indicates that the switch has been selected for use;
49+
0 indicates that the swich will not be used.
50+
51+
fc_map: The Fibre Channel MAP
52+
53+
vfid: The Virtual Fabric ID
54+
55+
mac: The FCF's MAC address
56+
57+
fka_peroid: The FIP Keep-Alive peroid
58+
59+
fabric_state: The internal kernel state
60+
"Unknown" - Initialization value
61+
"Disconnected" - No link to the FCF/fabric
62+
"Connected" - Host is connected to the FCF
63+
"Deleted" - FCF is being removed from the system
64+
65+
dev_loss_tmo: The device loss timeout peroid for this FCF.
66+
67+
Notes: A device loss infrastructre similar to the FC Transport's
68+
is present in fcoe_sysfs. It is nice to have so that a
69+
link flapping adapter doesn't continually advance the count
70+
used to identify the discovered FCF. FCFs will exist in a
71+
"Disconnected" state until either the timer expires and the
72+
FCF becomes "Deleted" or the FCF is rediscovered and becomes
73+
"Connected."
74+
75+
76+
Users: The first user of this interface will be the fcoeadm application,
77+
which is commonly packaged in the fcoe-utils package.

‎Documentation/ABI/testing/sysfs-bus-i2c-devices-lm3533

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
What: /sys/bus/i2c/devices/.../output_hvled[n]
2+
Date: April 2012
3+
KernelVersion: 3.5
4+
Contact: Johan Hovold <[email protected]>
5+
Description:
6+
Set the controlling backlight device for high-voltage current
7+
sink HVLED[n] (n = 1, 2) (0, 1).
8+
9+
What: /sys/bus/i2c/devices/.../output_lvled[n]
10+
Date: April 2012
11+
KernelVersion: 3.5
12+
Contact: Johan Hovold <[email protected]>
13+
Description:
14+
Set the controlling led device for low-voltage current sink
15+
LVLED[n] (n = 1..5) (0..3).

0 commit comments

Comments
 (0)