Skip to content

Commit 5974737

Browse files
committed
Merge branch 'next' into for-linus
Prepare input updates for 5.3 merge window.
2 parents f0dd687 + 593fdd4 commit 5974737

File tree

19,323 files changed

+1070890
-566204
lines changed

Some content is hidden

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

19,323 files changed

+1070890
-566204
lines changed

.clang-format

Lines changed: 68 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,14 @@ ForEachMacros:
7272
- 'apei_estatus_for_each_section'
7373
- 'ata_for_each_dev'
7474
- 'ata_for_each_link'
75+
- '__ata_qc_for_each'
76+
- 'ata_qc_for_each'
77+
- 'ata_qc_for_each_raw'
78+
- 'ata_qc_for_each_with_internal'
7579
- 'ax25_for_each'
7680
- 'ax25_uid_for_each'
81+
- '__bio_for_each_bvec'
82+
- 'bio_for_each_bvec'
7783
- 'bio_for_each_integrity_vec'
7884
- '__bio_for_each_segment'
7985
- 'bio_for_each_segment'
@@ -85,6 +91,7 @@ ForEachMacros:
8591
- 'blk_queue_for_each_rl'
8692
- 'bond_for_each_slave'
8793
- 'bond_for_each_slave_rcu'
94+
- 'bpf_for_each_spilled_reg'
8895
- 'btree_for_each_safe128'
8996
- 'btree_for_each_safe32'
9097
- 'btree_for_each_safe64'
@@ -103,6 +110,8 @@ ForEachMacros:
103110
- 'drm_atomic_crtc_for_each_plane'
104111
- 'drm_atomic_crtc_state_for_each_plane'
105112
- 'drm_atomic_crtc_state_for_each_plane_state'
113+
- 'drm_atomic_for_each_plane_damage'
114+
- 'drm_connector_for_each_possible_encoder'
106115
- 'drm_for_each_connector_iter'
107116
- 'drm_for_each_crtc'
108117
- 'drm_for_each_encoder'
@@ -111,32 +120,51 @@ ForEachMacros:
111120
- 'drm_for_each_legacy_plane'
112121
- 'drm_for_each_plane'
113122
- 'drm_for_each_plane_mask'
123+
- 'drm_for_each_privobj'
114124
- 'drm_mm_for_each_hole'
115125
- 'drm_mm_for_each_node'
116126
- 'drm_mm_for_each_node_in_range'
117127
- 'drm_mm_for_each_node_safe'
128+
- 'flow_action_for_each'
118129
- 'for_each_active_drhd_unit'
119130
- 'for_each_active_iommu'
120131
- 'for_each_available_child_of_node'
121132
- 'for_each_bio'
122133
- 'for_each_board_func_rsrc'
123134
- 'for_each_bvec'
135+
- 'for_each_card_components'
136+
- 'for_each_card_links'
137+
- 'for_each_card_links_safe'
138+
- 'for_each_card_prelinks'
139+
- 'for_each_card_rtds'
140+
- 'for_each_card_rtds_safe'
141+
- 'for_each_cgroup_storage_type'
124142
- 'for_each_child_of_node'
125143
- 'for_each_clear_bit'
126144
- 'for_each_clear_bit_from'
127145
- 'for_each_cmsghdr'
128146
- 'for_each_compatible_node'
147+
- 'for_each_component_dais'
148+
- 'for_each_component_dais_safe'
149+
- 'for_each_comp_order'
129150
- 'for_each_console'
130151
- 'for_each_cpu'
131152
- 'for_each_cpu_and'
132153
- 'for_each_cpu_not'
133154
- 'for_each_cpu_wrap'
134155
- 'for_each_dev_addr'
135156
- 'for_each_dma_cap_mask'
157+
- 'for_each_dpcm_be'
158+
- 'for_each_dpcm_be_rollback'
159+
- 'for_each_dpcm_be_safe'
160+
- 'for_each_dpcm_fe'
136161
- 'for_each_drhd_unit'
137162
- 'for_each_dss_dev'
138163
- 'for_each_efi_memory_desc'
139164
- 'for_each_efi_memory_desc_in_map'
165+
- 'for_each_element'
166+
- 'for_each_element_extid'
167+
- 'for_each_element_id'
140168
- 'for_each_endpoint_of_node'
141169
- 'for_each_evictable_lru'
142170
- 'for_each_fib6_node_rt_rcu'
@@ -149,6 +177,7 @@ ForEachMacros:
149177
- 'for_each_iommu'
150178
- 'for_each_ip_tunnel_rcu'
151179
- 'for_each_irq_nr'
180+
- 'for_each_link_codecs'
152181
- 'for_each_lru'
153182
- 'for_each_matching_node'
154183
- 'for_each_matching_node_and_match'
@@ -160,6 +189,7 @@ ForEachMacros:
160189
- 'for_each_mem_range_rev'
161190
- 'for_each_migratetype_order'
162191
- 'for_each_msi_entry'
192+
- 'for_each_msi_entry_safe'
163193
- 'for_each_net'
164194
- 'for_each_netdev'
165195
- 'for_each_netdev_continue'
@@ -172,6 +202,7 @@ ForEachMacros:
172202
- 'for_each_net_rcu'
173203
- 'for_each_new_connector_in_state'
174204
- 'for_each_new_crtc_in_state'
205+
- 'for_each_new_mst_mgr_in_state'
175206
- 'for_each_new_plane_in_state'
176207
- 'for_each_new_private_obj_in_state'
177208
- 'for_each_node'
@@ -183,12 +214,16 @@ ForEachMacros:
183214
- 'for_each_node_with_property'
184215
- 'for_each_of_allnodes'
185216
- 'for_each_of_allnodes_from'
217+
- 'for_each_of_cpu_node'
186218
- 'for_each_of_pci_range'
187219
- 'for_each_old_connector_in_state'
188220
- 'for_each_old_crtc_in_state'
221+
- 'for_each_old_mst_mgr_in_state'
189222
- 'for_each_oldnew_connector_in_state'
190223
- 'for_each_oldnew_crtc_in_state'
224+
- 'for_each_oldnew_mst_mgr_in_state'
191225
- 'for_each_oldnew_plane_in_state'
226+
- 'for_each_oldnew_plane_in_state_reverse'
192227
- 'for_each_oldnew_private_obj_in_state'
193228
- 'for_each_old_plane_in_state'
194229
- 'for_each_old_private_obj_in_state'
@@ -206,14 +241,21 @@ ForEachMacros:
206241
- 'for_each_process'
207242
- 'for_each_process_thread'
208243
- 'for_each_property_of_node'
244+
- 'for_each_registered_fb'
209245
- 'for_each_reserved_mem_region'
210-
- 'for_each_resv_unavail_range'
246+
- 'for_each_rtd_codec_dai'
247+
- 'for_each_rtd_codec_dai_rollback'
211248
- 'for_each_rtdcom'
212249
- 'for_each_rtdcom_safe'
213250
- 'for_each_set_bit'
214251
- 'for_each_set_bit_from'
215252
- 'for_each_sg'
253+
- 'for_each_sg_dma_page'
216254
- 'for_each_sg_page'
255+
- 'for_each_sibling_event'
256+
- 'for_each_subelement'
257+
- 'for_each_subelement_extid'
258+
- 'for_each_subelement_id'
217259
- '__for_each_thread'
218260
- 'for_each_thread'
219261
- 'for_each_zone'
@@ -223,6 +265,8 @@ ForEachMacros:
223265
- 'fwnode_for_each_child_node'
224266
- 'fwnode_graph_for_each_endpoint'
225267
- 'gadget_for_each_ep'
268+
- 'genradix_for_each'
269+
- 'genradix_for_each_from'
226270
- 'hash_for_each'
227271
- 'hash_for_each_possible'
228272
- 'hash_for_each_possible_rcu'
@@ -251,6 +295,8 @@ ForEachMacros:
251295
- 'hlist_nulls_for_each_entry_from'
252296
- 'hlist_nulls_for_each_entry_rcu'
253297
- 'hlist_nulls_for_each_entry_safe'
298+
- 'i3c_bus_for_each_i2cdev'
299+
- 'i3c_bus_for_each_i3cdev'
254300
- 'ide_host_for_each_port'
255301
- 'ide_port_for_each_dev'
256302
- 'ide_port_for_each_present_dev'
@@ -259,19 +305,25 @@ ForEachMacros:
259305
- 'idr_for_each_entry_ul'
260306
- 'inet_bind_bucket_for_each'
261307
- 'inet_lhash2_for_each_icsk_rcu'
262-
- 'iov_for_each'
263308
- 'key_for_each'
264309
- 'key_for_each_safe'
265310
- 'klp_for_each_func'
311+
- 'klp_for_each_func_safe'
312+
- 'klp_for_each_func_static'
266313
- 'klp_for_each_object'
314+
- 'klp_for_each_object_safe'
315+
- 'klp_for_each_object_static'
267316
- 'kvm_for_each_memslot'
268317
- 'kvm_for_each_vcpu'
269318
- 'list_for_each'
319+
- 'list_for_each_codec'
320+
- 'list_for_each_codec_safe'
270321
- 'list_for_each_entry'
271322
- 'list_for_each_entry_continue'
272323
- 'list_for_each_entry_continue_rcu'
273324
- 'list_for_each_entry_continue_reverse'
274325
- 'list_for_each_entry_from'
326+
- 'list_for_each_entry_from_rcu'
275327
- 'list_for_each_entry_from_reverse'
276328
- 'list_for_each_entry_lockless'
277329
- 'list_for_each_entry_rcu'
@@ -291,6 +343,9 @@ ForEachMacros:
291343
- 'media_device_for_each_intf'
292344
- 'media_device_for_each_link'
293345
- 'media_device_for_each_pad'
346+
- 'mp_bvec_for_each_page'
347+
- 'mp_bvec_for_each_segment'
348+
- 'nanddev_io_for_each_page'
294349
- 'netdev_for_each_lower_dev'
295350
- 'netdev_for_each_lower_private'
296351
- 'netdev_for_each_lower_private_rcu'
@@ -326,6 +381,7 @@ ForEachMacros:
326381
- 'radix_tree_for_each_slot'
327382
- 'radix_tree_for_each_tagged'
328383
- 'rbtree_postorder_for_each_entry_safe'
384+
- 'rdma_for_each_port'
329385
- 'resource_list_for_each_entry'
330386
- 'resource_list_for_each_entry_safe'
331387
- 'rhl_for_each_entry_rcu'
@@ -340,6 +396,7 @@ ForEachMacros:
340396
- 'rht_for_each_rcu'
341397
- 'rht_for_each_rcu_continue'
342398
- '__rq_for_each_bio'
399+
- 'rq_for_each_bvec'
343400
- 'rq_for_each_segment'
344401
- 'scsi_for_each_prot_sg'
345402
- 'scsi_for_each_sg'
@@ -357,12 +414,14 @@ ForEachMacros:
357414
- 'sk_nulls_for_each'
358415
- 'sk_nulls_for_each_from'
359416
- 'sk_nulls_for_each_rcu'
417+
- 'snd_array_for_each'
360418
- 'snd_pcm_group_for_each_entry'
361419
- 'snd_soc_dapm_widget_for_each_path'
362420
- 'snd_soc_dapm_widget_for_each_path_safe'
363421
- 'snd_soc_dapm_widget_for_each_sink_path'
364422
- 'snd_soc_dapm_widget_for_each_source_path'
365423
- 'tb_property_for_each'
424+
- 'tcf_exts_for_each_action'
366425
- 'udp_portaddr_for_each_entry'
367426
- 'udp_portaddr_for_each_entry_rcu'
368427
- 'usb_hub_for_each_child'
@@ -371,6 +430,13 @@ ForEachMacros:
371430
- 'v4l2_m2m_for_each_dst_buf_safe'
372431
- 'v4l2_m2m_for_each_src_buf'
373432
- 'v4l2_m2m_for_each_src_buf_safe'
433+
- 'virtio_device_for_each_vq'
434+
- 'xa_for_each'
435+
- 'xa_for_each_marked'
436+
- 'xa_for_each_start'
437+
- 'xas_for_each'
438+
- 'xas_for_each_conflict'
439+
- 'xas_for_each_marked'
374440
- 'zorro_for_each_dev'
375441

376442
#IncludeBlocks: Preserve # Unknown to clang-format-5.0

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*.bin
1616
*.bz2
1717
*.c.[012]*.*
18+
*.dt.yaml
1819
*.dtb
1920
*.dtb.S
2021
*.dwo

.mailmap

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ Bart Van Assche <[email protected]> <[email protected]>
3636
Ben Gardner <[email protected]>
3737
Ben M Cahill <[email protected]>
3838
Björn Steinbrink <[email protected]>
39-
40-
41-
39+
40+
41+
42+
4243
Brian Avery <[email protected]>
4344
Brian King <[email protected]>
4445
Christoph Hellwig <[email protected]>
@@ -47,7 +48,10 @@ Corey Minyard <[email protected]>
4748
Damian Hobson-Garcia <[email protected]>
4849
David Brownell <[email protected]>
4950
David Woodhouse <[email protected]>
50-
51+
52+
53+
54+
5155
Dmitry Eremin-Solenikov <[email protected]>
5256
Domen Puncer <[email protected]>
5357
Douglas Gilbert <[email protected]>
@@ -119,6 +123,7 @@ Mark Brown <[email protected]>
119123
120124
121125
126+
Mathieu Othacehe <[email protected]>
122127
123128
124129
@@ -151,6 +156,8 @@ Morten Welinder <[email protected]>
151156
Morten Welinder <[email protected]>
152157
Mythri P K <[email protected]>
153158
Nguyen Anh Quynh <[email protected]>
159+
160+
154161
Paolo 'Blaisorblade' Giarrusso <[email protected]>
155162
Patrick Mochel <[email protected]>
156163
@@ -219,3 +226,5 @@ Yakir Yang <[email protected]> <[email protected]>
219226
Yusuke Goda <[email protected]>
220227
Gustavo Padovan <[email protected]>
221228
Gustavo Padovan <[email protected]>
229+
230+

CREDITS

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -842,10 +842,9 @@ D: ax25-utils maintainer.
842842

843843
N: Helge Deller
844844
845-
846-
D: PA-RISC Linux hacker, LASI-, ASP-, WAX-, LCD/LED-driver
847-
S: Schimmelsrain 1
848-
S: D-69231 Rauenberg
845+
W: http://www.parisc-linux.org/
846+
D: PA-RISC Linux architecture maintainer
847+
D: LASI-, ASP-, WAX-, LCD/LED-driver
849848
S: Germany
850849

851850
N: Jean Delvare
@@ -1222,7 +1221,7 @@ S: Brazil
12221221

12231222
N: Oded Gabbay
12241223
1225-
D: AMD KFD maintainer
1224+
D: HabanaLabs and AMD KFD maintainer
12261225
S: 12 Shraga Raphaeli
12271226
S: Petah-Tikva, 4906418
12281227
S: Israel
@@ -1361,7 +1360,7 @@ S: Stellenbosch, Western Cape
13611360
S: South Africa
13621361

13631362
N: Grant Grundler
1364-
1363+
13651364
W: http://obmouse.sourceforge.net/
13661365
W: http://www.parisc-linux.org/
13671366
D: obmouse - rewrote Olivier Florent's Omnibook 600 "pop-up" mouse driver
@@ -2208,6 +2207,12 @@ N: Christopher Li
22082207
22092208
D: Sparse maintainer 2009 - 2018
22102209

2210+
N: Shaohua Li
2211+
D: Worked on many parts of the kernel, from core x86, ACPI, PCI, KVM, MM,
2212+
D: and much more. He was the maintainer of MD from 2016 to 2018. Shaohua
2213+
D: passed away late 2018, he will be greatly missed.
2214+
W: https://www.spinics.net/lists/raid/msg61993.html
2215+
22112216
N: Stephan Linz
22122217
22132218
@@ -2486,7 +2491,7 @@ S: Syracuse, New York 13206
24862491
S: USA
24872492

24882493
N: Kyle McMartin
2489-
E: kyle@parisc-linux.org
2494+
E: kyle@mcmartin.ca
24902495
D: Linux/PARISC hacker
24912496
D: AD1889 sound driver
24922497
S: Ottawa, Canada
@@ -3774,14 +3779,13 @@ S: 21513 Conradia Ct
37743779
S: Cupertino, CA 95014
37753780
S: USA
37763781

3777-
N: Thibaut Varene
3778-
3779-
W: http://www.parisc-linux.org/~varenet/
3780-
P: 1024D/B7D2F063 E67C 0D43 A75E 12A5 BB1C FA2F 1E32 C3DA B7D2 F063
3782+
N: Thibaut Varène
3783+
3784+
W: http://hacks.slashdirt.org/
37813785
D: PA-RISC port minion, PDC and GSCPS2 drivers, debuglocks and other bits
37823786
D: Some ARM at91rm9200 bits, S1D13XXX FB driver, random patches here and there
37833787
D: AD1889 sound driver
3784-
S: Paris, France
3788+
S: France
37853789

37863790
N: Heikki Vatiainen
37873791

0 commit comments

Comments
 (0)