Skip to content

Commit ec3b34e

Browse files
author
Jiri Kosina
committed
Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus
Conflicts: drivers/hid/wacom_wac.c
9 parents 817a312 + 3e48138 + 181a8b9 + 81bb773 + 10e87dc + 30ee72f + 6e5e9a0 + b2723eb + 2a6cdbd commit ec3b34e

File tree

8,048 files changed

+337227
-177343
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,048 files changed

+337227
-177343
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
*.order
2525
*.elf
2626
*.bin
27+
*.tar
2728
*.gz
2829
*.bz2
2930
*.lzma

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ Rajesh Shah <[email protected]>
100100
Ralf Baechle <[email protected]>
101101
Ralf Wildenhues <[email protected]>
102102
Rémi Denis-Courmont <[email protected]>
103+
Ricardo Ribalda Delgado <[email protected]>
103104
Rudolf Marek <[email protected]>
104105
Rui Saraiva <[email protected]>
105106
Sachin P Sant <[email protected]>

‎CREDITS

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,10 @@ E: [email protected]
508508
W: http://paulbristow.net/linux/idefloppy.html
509509
D: Maintainer of IDE/ATAPI floppy driver
510510

511+
N: Stefano Brivio
512+
E: [email protected]
513+
D: Broadcom B43 driver
514+
511515
N: Dominik Brodowski
512516
E: [email protected]
513517
W: http://www.brodo.de/
@@ -2045,6 +2049,10 @@ D: pirq addr, CS5535 alsa audio driver
20452049
S: Gurgaon, India
20462050
S: Kuala Lumpur, Malaysia
20472051

2052+
N: Mohit Kumar
2053+
D: ST Microelectronics SPEAr13xx PCI host bridge driver
2054+
D: Synopsys Designware PCI host bridge driver
2055+
20482056
N: Gabor Kuti
20492057
M: [email protected]
20502058
M: [email protected]
@@ -3008,6 +3016,19 @@ W: http://www.qsl.net/dl1bke/
30083016
D: Generic Z8530 driver, AX.25 DAMA slave implementation
30093017
D: Several AX.25 hacks
30103018

3019+
N: Ricardo Ribalda Delgado
3020+
E: [email protected]
3021+
W: http://ribalda.com
3022+
D: PLX USB338x driver
3023+
D: PCA9634 driver
3024+
D: Option GTM671WFS
3025+
D: Fintek F81216A
3026+
D: Various kernel hacks
3027+
S: Qtechnology A/S
3028+
S: Valby Langgade 142
3029+
S: 2500 Valby
3030+
S: Denmark
3031+
30113032
N: Francois-Rene Rideau
30123033
E: [email protected]
30133034
W: http://www.tunes.org/~fare
@@ -3688,6 +3709,13 @@ N: Dirk Verworner
36883709
D: Co-author of German book ``Linux-Kernel-Programmierung''
36893710
D: Co-founder of Berlin Linux User Group
36903711

3712+
N: Andrew Victor
3713+
E: [email protected]
3714+
W: http://maxim.org.za/at91_26.html
3715+
D: First maintainer of Atmel ARM-based SoC, aka AT91
3716+
D: Introduced support for at91rm9200, the first chip of AT91 family
3717+
S: South Africa
3718+
36913719
N: Riku Voipio
36923720
E: [email protected]
36933721
D: Author of PCA9532 LED and Fintek f75375s hwmon driver

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

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
What: /sys/block/zram<id>/num_reads
2+
Date: August 2015
3+
Contact: Sergey Senozhatsky <[email protected]>
4+
Description:
5+
The num_reads file is read-only and specifies the number of
6+
reads (failed or successful) done on this device.
7+
Now accessible via zram<id>/stat node.
8+
9+
What: /sys/block/zram<id>/num_writes
10+
Date: August 2015
11+
Contact: Sergey Senozhatsky <[email protected]>
12+
Description:
13+
The num_writes file is read-only and specifies the number of
14+
writes (failed or successful) done on this device.
15+
Now accessible via zram<id>/stat node.
16+
17+
What: /sys/block/zram<id>/invalid_io
18+
Date: August 2015
19+
Contact: Sergey Senozhatsky <[email protected]>
20+
Description:
21+
The invalid_io file is read-only and specifies the number of
22+
non-page-size-aligned I/O requests issued to this device.
23+
Now accessible via zram<id>/io_stat node.
24+
25+
What: /sys/block/zram<id>/failed_reads
26+
Date: August 2015
27+
Contact: Sergey Senozhatsky <[email protected]>
28+
Description:
29+
The failed_reads file is read-only and specifies the number of
30+
failed reads happened on this device.
31+
Now accessible via zram<id>/io_stat node.
32+
33+
What: /sys/block/zram<id>/failed_writes
34+
Date: August 2015
35+
Contact: Sergey Senozhatsky <[email protected]>
36+
Description:
37+
The failed_writes file is read-only and specifies the number of
38+
failed writes happened on this device.
39+
Now accessible via zram<id>/io_stat node.
40+
41+
What: /sys/block/zram<id>/notify_free
42+
Date: August 2015
43+
Contact: Sergey Senozhatsky <[email protected]>
44+
Description:
45+
The notify_free file is read-only. Depending on device usage
46+
scenario it may account a) the number of pages freed because
47+
of swap slot free notifications or b) the number of pages freed
48+
because of REQ_DISCARD requests sent by bio. The former ones
49+
are sent to a swap block device when a swap slot is freed, which
50+
implies that this disk is being used as a swap disk. The latter
51+
ones are sent by filesystem mounted with discard option,
52+
whenever some data blocks are getting discarded.
53+
Now accessible via zram<id>/io_stat node.
54+
55+
What: /sys/block/zram<id>/zero_pages
56+
Date: August 2015
57+
Contact: Sergey Senozhatsky <[email protected]>
58+
Description:
59+
The zero_pages file is read-only and specifies number of zero
60+
filled pages written to this disk. No memory is allocated for
61+
such pages.
62+
Now accessible via zram<id>/mm_stat node.
63+
64+
What: /sys/block/zram<id>/orig_data_size
65+
Date: August 2015
66+
Contact: Sergey Senozhatsky <[email protected]>
67+
Description:
68+
The orig_data_size file is read-only and specifies uncompressed
69+
size of data stored in this disk. This excludes zero-filled
70+
pages (zero_pages) since no memory is allocated for them.
71+
Unit: bytes
72+
Now accessible via zram<id>/mm_stat node.
73+
74+
What: /sys/block/zram<id>/compr_data_size
75+
Date: August 2015
76+
Contact: Sergey Senozhatsky <[email protected]>
77+
Description:
78+
The compr_data_size file is read-only and specifies compressed
79+
size of data stored in this disk. So, compression ratio can be
80+
calculated using orig_data_size and this statistic.
81+
Unit: bytes
82+
Now accessible via zram<id>/mm_stat node.
83+
84+
What: /sys/block/zram<id>/mem_used_total
85+
Date: August 2015
86+
Contact: Sergey Senozhatsky <[email protected]>
87+
Description:
88+
The mem_used_total file is read-only and specifies the amount
89+
of memory, including allocator fragmentation and metadata
90+
overhead, allocated for this disk. So, allocator space
91+
efficiency can be calculated using compr_data_size and this
92+
statistic.
93+
Unit: bytes
94+
Now accessible via zram<id>/mm_stat node.
95+
96+
What: /sys/block/zram<id>/mem_used_max
97+
Date: August 2015
98+
Contact: Sergey Senozhatsky <[email protected]>
99+
Description:
100+
The mem_used_max file is read/write and specifies the amount
101+
of maximum memory zram have consumed to store compressed data.
102+
For resetting the value, you should write "0". Otherwise,
103+
you could see -EINVAL.
104+
Unit: bytes
105+
Downgraded to write-only node: so it's possible to set new
106+
value only; its current value is stored in zram<id>/mm_stat
107+
node.
108+
109+
What: /sys/block/zram<id>/mem_limit
110+
Date: August 2015
111+
Contact: Sergey Senozhatsky <[email protected]>
112+
Description:
113+
The mem_limit file is read/write and specifies the maximum
114+
amount of memory ZRAM can use to store the compressed data.
115+
The limit could be changed in run time and "0" means disable
116+
the limit. No limit is the initial state. Unit: bytes
117+
Downgraded to write-only node: so it's possible to set new
118+
value only; its current value is stored in zram<id>/mm_stat
119+
node.

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,25 @@ Description: Device-mapper device suspend state.
2323
Contains the value 1 while the device is suspended.
2424
Otherwise it contains 0. Read-only attribute.
2525
Users: util-linux, device-mapper udev rules
26+
27+
What: /sys/block/dm-<num>/dm/rq_based_seq_io_merge_deadline
28+
Date: March 2015
29+
KernelVersion: 4.1
30+
Contact: [email protected]
31+
Description: Allow control over how long a request that is a
32+
reasonable merge candidate can be queued on the request
33+
queue. The resolution of this deadline is in
34+
microseconds (ranging from 1 to 100000 usecs).
35+
Setting this attribute to 0 (the default) will disable
36+
request-based DM's merge heuristic and associated extra
37+
accounting. This attribute is not applicable to
38+
bio-based DM devices so it will only ever report 0 for
39+
them.
40+
41+
What: /sys/block/dm-<num>/dm/use_blk_mq
42+
Date: March 2015
43+
KernelVersion: 4.1
44+
Contact: [email protected]
45+
Description: Request-based Device-mapper blk-mq I/O path mode.
46+
Contains the value 1 if the device is using blk-mq.
47+
Otherwise it contains 0. Read-only attribute.

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,3 +141,28 @@ Description:
141141
amount of memory ZRAM can use to store the compressed data. The
142142
limit could be changed in run time and "0" means disable the
143143
limit. No limit is the initial state. Unit: bytes
144+
145+
What: /sys/block/zram<id>/compact
146+
Date: August 2015
147+
Contact: Minchan Kim <[email protected]>
148+
Description:
149+
The compact file is write-only and trigger compaction for
150+
allocator zrm uses. The allocator moves some objects so that
151+
it could free fragment space.
152+
153+
What: /sys/block/zram<id>/io_stat
154+
Date: August 2015
155+
Contact: Sergey Senozhatsky <[email protected]>
156+
Description:
157+
The io_stat file is read-only and accumulates device's I/O
158+
statistics not accounted by block layer. For example,
159+
failed_reads, failed_writes, etc. File format is similar to
160+
block layer statistics file format.
161+
162+
What: /sys/block/zram<id>/mm_stat
163+
Date: August 2015
164+
Contact: Sergey Senozhatsky <[email protected]>
165+
Description:
166+
The mm_stat file is read-only and represents device's mm
167+
statistics (orig_data_size, compr_data_size, etc.) in a format
168+
similar to block layer statistics file format.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Description: read only
100100
Hexadecimal value of the device ID found in this AFU
101101
configuration record.
102102

103-
What: /sys/class/cxl/<afu>/cr<config num>/vendor
103+
What: /sys/class/cxl/<afu>/cr<config num>/class
104104
Date: February 2015
105105
Contact: [email protected]
106106
Description: read only

‎Documentation/ABI/testing/sysfs-class-led-flash

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
What: /sys/class/leds/<led>/flash_brightness
2+
Date: March 2015
3+
KernelVersion: 4.0
4+
Contact: Jacek Anaszewski <[email protected]>
5+
Description: read/write
6+
Set the brightness of this LED in the flash strobe mode, in
7+
microamperes. The file is created only for the flash LED devices
8+
that support setting flash brightness.
9+
10+
The value is between 0 and
11+
/sys/class/leds/<led>/max_flash_brightness.
12+
13+
What: /sys/class/leds/<led>/max_flash_brightness
14+
Date: March 2015
15+
KernelVersion: 4.0
16+
Contact: Jacek Anaszewski <[email protected]>
17+
Description: read only
18+
Maximum brightness level for this LED in the flash strobe mode,
19+
in microamperes.
20+
21+
What: /sys/class/leds/<led>/flash_timeout
22+
Date: March 2015
23+
KernelVersion: 4.0
24+
Contact: Jacek Anaszewski <[email protected]>
25+
Description: read/write
26+
Hardware timeout for flash, in microseconds. The flash strobe
27+
is stopped after this period of time has passed from the start
28+
of the strobe. The file is created only for the flash LED
29+
devices that support setting flash timeout.
30+
31+
What: /sys/class/leds/<led>/max_flash_timeout
32+
Date: March 2015
33+
KernelVersion: 4.0
34+
Contact: Jacek Anaszewski <[email protected]>
35+
Description: read only
36+
Maximum flash timeout for this LED, in microseconds.
37+
38+
What: /sys/class/leds/<led>/flash_strobe
39+
Date: March 2015
40+
KernelVersion: 4.0
41+
Contact: Jacek Anaszewski <[email protected]>
42+
Description: read/write
43+
Flash strobe state. When written with 1 it triggers flash strobe
44+
and when written with 0 it turns the flash off.
45+
46+
On read 1 means that flash is currently strobing and 0 means
47+
that flash is off.
48+
49+
What: /sys/class/leds/<led>/flash_fault
50+
Date: March 2015
51+
KernelVersion: 4.0
52+
Contact: Jacek Anaszewski <[email protected]>
53+
Description: read only
54+
Space separated list of flash faults that may have occurred.
55+
Flash faults are re-read after strobing the flash. Possible
56+
flash faults:
57+
58+
* led-over-voltage - flash controller voltage to the flash LED
59+
has exceeded the limit specific to the flash controller
60+
* flash-timeout-exceeded - the flash strobe was still on when
61+
the timeout set by the user has expired; not all flash
62+
controllers may set this in all such conditions
63+
* controller-over-temperature - the flash controller has
64+
overheated
65+
* controller-short-circuit - the short circuit protection
66+
of the flash controller has been triggered
67+
* led-power-supply-over-current - current in the LED power
68+
supply has exceeded the limit specific to the flash
69+
controller
70+
* indicator-led-fault - the flash controller has detected
71+
a short or open circuit condition on the indicator LED
72+
* led-under-voltage - flash controller voltage to the flash
73+
LED has been below the minimum limit specific to
74+
the flash
75+
* controller-under-voltage - the input voltage of the flash
76+
controller is below the limit under which strobing the
77+
flash at full current will not be possible;
78+
the condition persists until this flag is no longer set
79+
* led-over-temperature - the temperature of the LED has exceeded
80+
its allowed upper limit

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,3 +222,13 @@ Description:
222222
The number of blocks that are marked as reserved, if any, in
223223
this partition. These are typically used to store the in-flash
224224
bad block table (BBT).
225+
226+
What: /sys/class/mtd/mtdX/offset
227+
Date: March 2015
228+
KernelVersion: 4.1
229+
Contact: [email protected]
230+
Description:
231+
For a partition, the offset of that partition from the start
232+
of the master device in bytes. This attribute is absent on
233+
main devices, so it can be used to distinguish between
234+
partitions and devices that aren't partitions.

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,14 @@ Description:
188188
Indicates the interface unique physical port identifier within
189189
the NIC, as a string.
190190

191+
What: /sys/class/net/<iface>/phys_port_name
192+
Date: March 2015
193+
KernelVersion: 4.0
194+
Contact: [email protected]
195+
Description:
196+
Indicates the interface physical port name within the NIC,
197+
as a string.
198+
191199
What: /sys/class/net/<iface>/speed
192200
Date: October 2009
193201
KernelVersion: 2.6.33

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ Description:
2424
Indicates the number of transmit timeout events seen by this
2525
network interface transmit queue.
2626

27+
What: /sys/class/<iface>/queues/tx-<queue>/tx_maxrate
28+
Date: March 2015
29+
KernelVersion: 4.1
30+
Contact: [email protected]
31+
Description:
32+
A Mbps max-rate set for the queue, a value of zero means disabled,
33+
default is disabled.
34+
2735
What: /sys/class/<iface>/queues/tx-<queue>/xps_cpus
2836
Date: November 2010
2937
KernelVersion: 2.6.38

0 commit comments

Comments
 (0)