Skip to content

Commit 2c33ce0

Browse files
airliedairlied
committed
Merge Linus master into drm-next
The merge is clean, but the arm build fails afterwards, due to API changes in the regulator tree. I've included the patch into the merge to fix the build. Signed-off-by: Dave Airlie <[email protected]>
2 parents cec32a4 + 09d5160 commit 2c33ce0

File tree

6,745 files changed

+276922
-138053
lines changed

Some content is hidden

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

6,745 files changed

+276922
-138053
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: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,10 @@ N: Krishna Balasubramanian
187187
E: [email protected]
188188
D: Wrote SYS V IPC (part of standard kernel since 0.99.10)
189189

190+
N: Chris Ball
191+
E: [email protected]
192+
D: Former maintainer of the MMC/SD/SDIO subsystem.
193+
190194
N: Dario Ballabio
191195
E: [email protected]
192196
E: [email protected]
@@ -504,6 +508,10 @@ E: [email protected]
504508
W: http://paulbristow.net/linux/idefloppy.html
505509
D: Maintainer of IDE/ATAPI floppy driver
506510

511+
N: Stefano Brivio
512+
E: [email protected]
513+
D: Broadcom B43 driver
514+
507515
N: Dominik Brodowski
508516
E: [email protected]
509517
W: http://www.brodo.de/
@@ -3004,6 +3012,19 @@ W: http://www.qsl.net/dl1bke/
30043012
D: Generic Z8530 driver, AX.25 DAMA slave implementation
30053013
D: Several AX.25 hacks
30063014

3015+
N: Ricardo Ribalda Delgado
3016+
E: [email protected]
3017+
W: http://ribalda.com
3018+
D: PLX USB338x driver
3019+
D: PCA9634 driver
3020+
D: Option GTM671WFS
3021+
D: Fintek F81216A
3022+
D: Various kernel hacks
3023+
S: Qtechnology A/S
3024+
S: Valby Langgade 142
3025+
S: 2500 Valby
3026+
S: Denmark
3027+
30073028
N: Francois-Rene Rideau
30083029
E: [email protected]
30093030
W: http://www.tunes.org/~fare

‎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/stable/sysfs-devices

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Note: This documents additional properties of any device beyond what
2+
# is documented in Documentation/sysfs-rules.txt
3+
4+
What: /sys/devices/*/of_path
5+
Date: February 2015
6+
Contact: Device Tree mailing list <[email protected]>
7+
Description:
8+
Any device associated with a device-tree node will have
9+
an of_path symlink pointing to the corresponding device
10+
node in /sys/firmware/devicetree/

‎Documentation/ABI/testing/configfs-usb-gadget-printer

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
What: /config/usb-gadget/gadget/functions/printer.name
2+
Date: Apr 2015
3+
KernelVersion: 4.1
4+
Description:
5+
The attributes:
6+
7+
pnp_string - Data to be passed to the host in pnp string
8+
q_len - Number of requests per endpoint
9+

‎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.

0 commit comments

Comments
 (0)