Skip to content

Commit 976e364

Browse files
committed
Merge branch 'next' into for-linus
Prepare input updates for 5.5 merge window.
2 parents 8791663 + 71c296f commit 976e364

File tree

12,626 files changed

+751583
-356698
lines changed

Some content is hidden

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

12,626 files changed

+751583
-356698
lines changed

.clang-format

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,13 @@ ForEachMacros:
107107
- 'css_for_each_descendant_post'
108108
- 'css_for_each_descendant_pre'
109109
- 'device_for_each_child_node'
110+
- 'dma_fence_chain_for_each'
110111
- 'drm_atomic_crtc_for_each_plane'
111112
- 'drm_atomic_crtc_state_for_each_plane'
112113
- 'drm_atomic_crtc_state_for_each_plane_state'
113114
- 'drm_atomic_for_each_plane_damage'
115+
- 'drm_client_for_each_connector_iter'
116+
- 'drm_client_for_each_modeset'
114117
- 'drm_connector_for_each_possible_encoder'
115118
- 'drm_for_each_connector_iter'
116119
- 'drm_for_each_crtc'
@@ -126,6 +129,7 @@ ForEachMacros:
126129
- 'drm_mm_for_each_node_in_range'
127130
- 'drm_mm_for_each_node_safe'
128131
- 'flow_action_for_each'
132+
- 'for_each_active_dev_scope'
129133
- 'for_each_active_drhd_unit'
130134
- 'for_each_active_iommu'
131135
- 'for_each_available_child_of_node'
@@ -153,6 +157,8 @@ ForEachMacros:
153157
- 'for_each_cpu_not'
154158
- 'for_each_cpu_wrap'
155159
- 'for_each_dev_addr'
160+
- 'for_each_dev_scope'
161+
- 'for_each_displayid_db'
156162
- 'for_each_dma_cap_mask'
157163
- 'for_each_dpcm_be'
158164
- 'for_each_dpcm_be_rollback'
@@ -169,6 +175,8 @@ ForEachMacros:
169175
- 'for_each_evictable_lru'
170176
- 'for_each_fib6_node_rt_rcu'
171177
- 'for_each_fib6_walker_rt'
178+
- 'for_each_free_mem_pfn_range_in_zone'
179+
- 'for_each_free_mem_pfn_range_in_zone_from'
172180
- 'for_each_free_mem_range'
173181
- 'for_each_free_mem_range_reverse'
174182
- 'for_each_func_rsrc'
@@ -178,6 +186,7 @@ ForEachMacros:
178186
- 'for_each_ip_tunnel_rcu'
179187
- 'for_each_irq_nr'
180188
- 'for_each_link_codecs'
189+
- 'for_each_link_platforms'
181190
- 'for_each_lru'
182191
- 'for_each_matching_node'
183192
- 'for_each_matching_node_and_match'
@@ -302,7 +311,10 @@ ForEachMacros:
302311
- 'ide_port_for_each_present_dev'
303312
- 'idr_for_each_entry'
304313
- 'idr_for_each_entry_continue'
314+
- 'idr_for_each_entry_continue_ul'
305315
- 'idr_for_each_entry_ul'
316+
- 'in_dev_for_each_ifa_rcu'
317+
- 'in_dev_for_each_ifa_rtnl'
306318
- 'inet_bind_bucket_for_each'
307319
- 'inet_lhash2_for_each_icsk_rcu'
308320
- 'key_for_each'
@@ -343,8 +355,6 @@ ForEachMacros:
343355
- 'media_device_for_each_intf'
344356
- 'media_device_for_each_link'
345357
- 'media_device_for_each_pad'
346-
- 'mp_bvec_for_each_page'
347-
- 'mp_bvec_for_each_segment'
348358
- 'nanddev_io_for_each_page'
349359
- 'netdev_for_each_lower_dev'
350360
- 'netdev_for_each_lower_private'
@@ -381,18 +391,19 @@ ForEachMacros:
381391
- 'radix_tree_for_each_slot'
382392
- 'radix_tree_for_each_tagged'
383393
- 'rbtree_postorder_for_each_entry_safe'
394+
- 'rdma_for_each_block'
384395
- 'rdma_for_each_port'
385396
- 'resource_list_for_each_entry'
386397
- 'resource_list_for_each_entry_safe'
387398
- 'rhl_for_each_entry_rcu'
388399
- 'rhl_for_each_rcu'
389400
- 'rht_for_each'
390-
- 'rht_for_each_from'
391401
- 'rht_for_each_entry'
392402
- 'rht_for_each_entry_from'
393403
- 'rht_for_each_entry_rcu'
394404
- 'rht_for_each_entry_rcu_from'
395405
- 'rht_for_each_entry_safe'
406+
- 'rht_for_each_from'
396407
- 'rht_for_each_rcu'
397408
- 'rht_for_each_rcu_from'
398409
- '__rq_for_each_bio'

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
*.lzo
3333
*.mod
3434
*.mod.c
35+
*.ns_deps
3536
*.o
3637
*.o.*
37-
*.order
3838
*.patch
3939
*.s
4040
*.so
@@ -46,6 +46,7 @@
4646
*.xz
4747
Module.symvers
4848
modules.builtin
49+
modules.order
4950

5051
#
5152
# Top-level generic files

.mailmap

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ Boris Brezillon <[email protected]> <[email protected]>
4747
4848
Brian Avery <[email protected]>
4949
Brian King <[email protected]>
50+
51+
5052
Christoph Hellwig <[email protected]>
5153
Christophe Ricard <[email protected]>
5254
Corey Minyard <[email protected]>
@@ -63,7 +65,11 @@ Dengcheng Zhu <[email protected]> <[email protected]>
6365
6466
6567
68+
6669
Dmitry Eremin-Solenikov <[email protected]>
70+
71+
72+
6773
Domen Puncer <[email protected]>
6874
Douglas Gilbert <[email protected]>
6975
Ed L. Cashin <[email protected]>
@@ -77,6 +83,8 @@ Frank Rowand <[email protected]> <[email protected]>
7783
7884
7985
Frank Zago <[email protected]>
86+
87+
8088
Greg Kroah-Hartman <greg@echidna.(none)>
8189
Greg Kroah-Hartman <[email protected]>
8290
Greg Kroah-Hartman <[email protected]>
@@ -87,6 +95,9 @@ Henrik Kretzschmar <[email protected]>
8795
Henrik Rydberg <[email protected]>
8896
Herbert Xu <[email protected]>
8997
Jacob Shin <[email protected]>
98+
99+
100+
90101
James Bottomley <jejb@mulgrave.(none)>
91102
James Bottomley <[email protected]>
92103
James E Wilson <[email protected]>
@@ -160,6 +171,8 @@ Matt Ranostay <[email protected]> Matthew Ranostay <[email protected]
160171
161172
162173
174+
175+
163176
Mayuresh Janorkar <[email protected]>
164177
Michael Buesch <[email protected]>
165178
Michel Dänzer <[email protected]>
@@ -173,23 +186,26 @@ Morten Welinder <[email protected]>
173186
Morten Welinder <[email protected]>
174187
Mythri P K <[email protected]>
175188
Nguyen Anh Quynh <[email protected]>
189+
176190
177191
192+
193+
194+
195+
196+
178197
Paolo 'Blaisorblade' Giarrusso <[email protected]>
179198
Patrick Mochel <[email protected]>
180-
199+
200+
181201
Peter A Jonsson <[email protected]>
182202
Peter Oruba <[email protected]>
183203
Peter Oruba <[email protected]>
184204
185205
Praveen BP <[email protected]>
186206
187207
188-
189-
190-
191-
192-
208+
193209
Rajesh Shah <[email protected]>
194210
Ralf Baechle <[email protected]>
195211
Ralf Wildenhues <[email protected]>
@@ -214,6 +230,7 @@ Shuah Khan <[email protected]> <[email protected]>
214230
215231
216232
233+
217234
Simon Kelley <[email protected]>
218235
Stéphane Witzmann <[email protected]>
219236
Stephen Hemminger <[email protected]>
@@ -224,6 +241,7 @@ Sumit Semwal <[email protected]>
224241
Tejun Heo <[email protected]>
225242
Thomas Graf <[email protected]>
226243
Thomas Pedersen <[email protected]>
244+
227245
Tony Luck <[email protected]>
228246
229247

CREDITS

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ S: Santa Cruz, California
751751
S: USA
752752

753753
N: Luis Correia
754-
754+
755755
D: Ralink rt2x00 WLAN driver
756756
S: Belas, Portugal
757757

@@ -1637,6 +1637,10 @@ S: Panoramastrasse 18
16371637
S: D-69126 Heidelberg
16381638
S: Germany
16391639

1640+
N: Simon Horman
1641+
1642+
D: Renesas ARM/ARM64 SoC maintainer
1643+
16401644
N: Christopher Horn
16411645
16421646
D: Miscellaneous sysctl hacks

Documentation/ABI/stable/sysfs-bus-w1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ Description: Bus scanning interval, microseconds component.
66
control systems are attached/generate presence for as short as
77
100 ms - hence the tens-to-hundreds milliseconds scan intervals
88
are required.
9-
see Documentation/w1/w1.generic for detailed information.
9+
see Documentation/w1/w1-generic.rst for detailed information.
1010
Users: any user space application which wants to know bus scanning
1111
interval

Documentation/ABI/stable/sysfs-driver-w1_ds28e04

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ What: /sys/bus/w1/devices/.../pio
22
Date: May 2012
33
Contact: Markus Franke <[email protected]>
44
Description: read/write the contents of the two PIO's of the DS28E04-100
5-
see Documentation/w1/slaves/w1_ds28e04 for detailed information
5+
see Documentation/w1/slaves/w1_ds28e04.rst for detailed information
66
Users: any user space application which wants to communicate with DS28E04-100
77

88

@@ -11,5 +11,5 @@ What: /sys/bus/w1/devices/.../eeprom
1111
Date: May 2012
1212
Contact: Markus Franke <[email protected]>
1313
Description: read/write the contents of the EEPROM memory of the DS28E04-100
14-
see Documentation/w1/slaves/w1_ds28e04 for detailed information
14+
see Documentation/w1/slaves/w1_ds28e04.rst for detailed information
1515
Users: any user space application which wants to communicate with DS28E04-100

Documentation/ABI/stable/sysfs-driver-w1_ds28ea00

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ What: /sys/bus/w1/devices/.../w1_seq
22
Date: Apr 2015
33
Contact: Matt Campbell <[email protected]>
44
Description: Support for the DS28EA00 chain sequence function
5-
see Documentation/w1/slaves/w1_therm for detailed information
5+
see Documentation/w1/slaves/w1_therm.rst for detailed information
66
Users: any user space application which wants to communicate with DS28EA00
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
What: /sys/kernel/debug/hisi_zip/<bdf>/comp_core[01]/regs
2+
Date: Nov 2018
3+
4+
Description: Dump of compression cores related debug registers.
5+
Only available for PF.
6+
7+
What: /sys/kernel/debug/hisi_zip/<bdf>/decomp_core[0-5]/regs
8+
Date: Nov 2018
9+
10+
Description: Dump of decompression cores related debug registers.
11+
Only available for PF.
12+
13+
What: /sys/kernel/debug/hisi_zip/<bdf>/clear_enable
14+
Date: Nov 2018
15+
16+
Description: Compression/decompression core debug registers read clear
17+
control. 1 means enable register read clear, otherwise 0.
18+
Writing to this file has no functional effect, only enable or
19+
disable counters clear after reading of these registers.
20+
Only available for PF.
21+
22+
What: /sys/kernel/debug/hisi_zip/<bdf>/current_qm
23+
Date: Nov 2018
24+
25+
Description: One ZIP controller has one PF and multiple VFs, each function
26+
has a QM. Select the QM which below qm refers to.
27+
Only available for PF.
28+
29+
What: /sys/kernel/debug/hisi_zip/<bdf>/qm/qm_regs
30+
Date: Nov 2018
31+
32+
Description: Dump of QM related debug registers.
33+
Available for PF and VF in host. VF in guest currently only
34+
has one debug register.
35+
36+
What: /sys/kernel/debug/hisi_zip/<bdf>/qm/current_q
37+
Date: Nov 2018
38+
39+
Description: One QM may contain multiple queues. Select specific queue to
40+
show its debug registers in above qm_regs.
41+
Only available for PF.
42+
43+
What: /sys/kernel/debug/hisi_zip/<bdf>/qm/clear_enable
44+
Date: Nov 2018
45+
46+
Description: QM debug registers(qm_regs) read clear control. 1 means enable
47+
register read clear, otherwise 0.
48+
Writing to this file has no functional effect, only enable or
49+
disable counters clear after reading of these registers.
50+
Only available for PF.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
What: /sys/kernel/debug/moxtet/input
2+
Date: March 2019
3+
KernelVersion: 5.3
4+
Contact: Marek Behún <[email protected]>
5+
Description: (R) Read input from the shift registers, in hexadecimal.
6+
Returns N+1 bytes, where N is the number of Moxtet connected
7+
modules. The first byte is from the CPU board itself.
8+
Example: 101214
9+
10: CPU board with SD card
10+
12: 2 = PCIe module, 1 = IRQ not active
11+
14: 4 = Peridot module, 1 = IRQ not active
12+
13+
What: /sys/kernel/debug/moxtet/output
14+
Date: March 2019
15+
KernelVersion: 5.3
16+
Contact: Marek Behún <[email protected]>
17+
Description: (RW) Read last written value to the shift registers, in
18+
hexadecimal, or write values to the shift registers, also
19+
in hexadecimal.
20+
Example: 0102
21+
01: 01 was last written, or is to be written, to the
22+
first module's shift register
23+
02: the same for second module

Documentation/ABI/testing/dev-kmsg

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Description: The /dev/kmsg character device node provides userspace access
1212
The logged line can be prefixed with a <N> syslog prefix, which
1313
carries the syslog priority and facility. The single decimal
1414
prefix number is composed of the 3 lowest bits being the syslog
15-
priority and the higher bits the syslog facility number.
15+
priority and the next 8 bits the syslog facility number.
1616

1717
If no prefix is given, the priority number is the default kernel
1818
log priority and the facility number is set to LOG_USER (1). It
@@ -90,13 +90,12 @@ Description: The /dev/kmsg character device node provides userspace access
9090
+sound:card0 - subsystem:devname
9191

9292
The flags field carries '-' by default. A 'c' indicates a
93-
fragment of a line. All following fragments are flagged with
94-
'+'. Note, that these hints about continuation lines are not
95-
necessarily correct, and the stream could be interleaved with
96-
unrelated messages, but merging the lines in the output
97-
usually produces better human readable results. A similar
98-
logic is used internally when messages are printed to the
99-
console, /proc/kmsg or the syslog() syscall.
93+
fragment of a line. Note, that these hints about continuation
94+
lines are not necessarily correct, and the stream could be
95+
interleaved with unrelated messages, but merging the lines in
96+
the output usually produces better human readable results. A
97+
similar logic is used internally when messages are printed to
98+
the console, /proc/kmsg or the syslog() syscall.
10099

101100
By default, kernel tries to avoid fragments by concatenating
102101
when it can and fragments are rare; however, when extended

0 commit comments

Comments
 (0)