Skip to content

Commit 25768de

Browse files
committed
Merge branch 'next' into for-linus
Prepare input updates for 6.14 merge window.
2 parents 3a6e5ed + 08bd5b7 commit 25768de

File tree

23,010 files changed

+1009034
-542327
lines changed

Some content is hidden

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

23,010 files changed

+1009034
-542327
lines changed

.clang-format

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,13 @@ ForEachMacros:
141141
- 'damon_for_each_target_safe'
142142
- 'damos_for_each_filter'
143143
- 'damos_for_each_filter_safe'
144+
- 'damos_for_each_quota_goal'
145+
- 'damos_for_each_quota_goal_safe'
144146
- 'data__for_each_file'
145147
- 'data__for_each_file_new'
146148
- 'data__for_each_file_start'
147149
- 'device_for_each_child_node'
148-
- 'displayid_iter_for_each'
150+
- 'device_for_each_child_node_scoped'
149151
- 'dma_fence_array_for_each'
150152
- 'dma_fence_chain_for_each'
151153
- 'dma_fence_unwrap_for_each'
@@ -172,11 +174,14 @@ ForEachMacros:
172174
- 'drm_for_each_plane'
173175
- 'drm_for_each_plane_mask'
174176
- 'drm_for_each_privobj'
175-
- 'drm_gem_for_each_gpuva'
176-
- 'drm_gem_for_each_gpuva_safe'
177+
- 'drm_gem_for_each_gpuvm_bo'
178+
- 'drm_gem_for_each_gpuvm_bo_safe'
177179
- 'drm_gpuva_for_each_op'
178180
- 'drm_gpuva_for_each_op_from_reverse'
181+
- 'drm_gpuva_for_each_op_reverse'
179182
- 'drm_gpuva_for_each_op_safe'
183+
- 'drm_gpuvm_bo_for_each_va'
184+
- 'drm_gpuvm_bo_for_each_va_safe'
180185
- 'drm_gpuvm_for_each_va'
181186
- 'drm_gpuvm_for_each_va_range'
182187
- 'drm_gpuvm_for_each_va_range_safe'
@@ -192,11 +197,11 @@ ForEachMacros:
192197
- 'dsa_switch_for_each_port_continue_reverse'
193198
- 'dsa_switch_for_each_port_safe'
194199
- 'dsa_switch_for_each_user_port'
200+
- 'dsa_switch_for_each_user_port_continue_reverse'
195201
- 'dsa_tree_for_each_cpu_port'
196202
- 'dsa_tree_for_each_user_port'
197203
- 'dsa_tree_for_each_user_port_continue_reverse'
198204
- 'dso__for_each_symbol'
199-
- 'dsos__for_each_with_build_id'
200205
- 'elf_hash_for_each_possible'
201206
- 'elf_symtab__for_each_symbol'
202207
- 'evlist__for_each_cpu'
@@ -216,6 +221,7 @@ ForEachMacros:
216221
- 'for_each_and_bit'
217222
- 'for_each_andnot_bit'
218223
- 'for_each_available_child_of_node'
224+
- 'for_each_available_child_of_node_scoped'
219225
- 'for_each_bench'
220226
- 'for_each_bio'
221227
- 'for_each_board_func_rsrc'
@@ -234,6 +240,7 @@ ForEachMacros:
234240
- 'for_each_card_widgets_safe'
235241
- 'for_each_cgroup_storage_type'
236242
- 'for_each_child_of_node'
243+
- 'for_each_child_of_node_scoped'
237244
- 'for_each_clear_bit'
238245
- 'for_each_clear_bit_from'
239246
- 'for_each_clear_bitrange'
@@ -251,6 +258,7 @@ ForEachMacros:
251258
- 'for_each_cpu'
252259
- 'for_each_cpu_and'
253260
- 'for_each_cpu_andnot'
261+
- 'for_each_cpu_from'
254262
- 'for_each_cpu_or'
255263
- 'for_each_cpu_wrap'
256264
- 'for_each_dapm_widgets'
@@ -269,13 +277,14 @@ ForEachMacros:
269277
- 'for_each_element'
270278
- 'for_each_element_extid'
271279
- 'for_each_element_id'
280+
- 'for_each_enabled_cpu'
272281
- 'for_each_endpoint_of_node'
273282
- 'for_each_event'
274283
- 'for_each_event_tps'
275284
- 'for_each_evictable_lru'
276285
- 'for_each_fib6_node_rt_rcu'
277286
- 'for_each_fib6_walker_rt'
278-
- 'for_each_free_mem_pfn_range_in_zone'
287+
- 'for_each_file_lock'
279288
- 'for_each_free_mem_pfn_range_in_zone_from'
280289
- 'for_each_free_mem_range'
281290
- 'for_each_free_mem_range_reverse'
@@ -286,15 +295,18 @@ ForEachMacros:
286295
- 'for_each_group_member'
287296
- 'for_each_group_member_head'
288297
- 'for_each_hstate'
298+
- 'for_each_hwgpio'
289299
- 'for_each_if'
290300
- 'for_each_inject_fn'
291301
- 'for_each_insn'
302+
- 'for_each_insn_op_loc'
292303
- 'for_each_insn_prefix'
293304
- 'for_each_intid'
294305
- 'for_each_iommu'
295306
- 'for_each_ip_tunnel_rcu'
296307
- 'for_each_irq_nr'
297308
- 'for_each_lang'
309+
- 'for_each_link_ch_maps'
298310
- 'for_each_link_codecs'
299311
- 'for_each_link_cpus'
300312
- 'for_each_link_platforms'
@@ -332,6 +344,9 @@ ForEachMacros:
332344
- 'for_each_new_plane_in_state_reverse'
333345
- 'for_each_new_private_obj_in_state'
334346
- 'for_each_new_reg'
347+
- 'for_each_nhlt_endpoint'
348+
- 'for_each_nhlt_endpoint_fmtcfg'
349+
- 'for_each_nhlt_fmtcfg'
335350
- 'for_each_node'
336351
- 'for_each_node_by_name'
337352
- 'for_each_node_by_type'
@@ -387,12 +402,15 @@ ForEachMacros:
387402
- 'for_each_reloc_from'
388403
- 'for_each_requested_gpio'
389404
- 'for_each_requested_gpio_in_range'
405+
- 'for_each_reserved_child_of_node'
390406
- 'for_each_reserved_mem_range'
391407
- 'for_each_reserved_mem_region'
408+
- 'for_each_rtd_ch_maps'
392409
- 'for_each_rtd_codec_dais'
393410
- 'for_each_rtd_components'
394411
- 'for_each_rtd_cpu_dais'
395412
- 'for_each_rtd_dais'
413+
- 'for_each_rtd_dais_reverse'
396414
- 'for_each_sband_iftype_data'
397415
- 'for_each_script'
398416
- 'for_each_sec'
@@ -533,8 +551,6 @@ ForEachMacros:
533551
- 'lwq_for_each_safe'
534552
- 'map__for_each_symbol'
535553
- 'map__for_each_symbol_by_name'
536-
- 'maps__for_each_entry'
537-
- 'maps__for_each_entry_safe'
538554
- 'mas_for_each'
539555
- 'mci_for_each_dimm'
540556
- 'media_device_for_each_entity'
@@ -560,7 +576,9 @@ ForEachMacros:
560576
- 'netdev_hw_addr_list_for_each'
561577
- 'nft_rule_for_each_expr'
562578
- 'nla_for_each_attr'
579+
- 'nla_for_each_attr_type'
563580
- 'nla_for_each_nested'
581+
- 'nla_for_each_nested_type'
564582
- 'nlmsg_for_each_attr'
565583
- 'nlmsg_for_each_msg'
566584
- 'nr_neigh_for_each'
@@ -579,6 +597,7 @@ ForEachMacros:
579597
- 'perf_config_sections__for_each_entry'
580598
- 'perf_config_set__for_each_entry'
581599
- 'perf_cpu_map__for_each_cpu'
600+
- 'perf_cpu_map__for_each_cpu_skip_any'
582601
- 'perf_cpu_map__for_each_idx'
583602
- 'perf_evlist__for_each_entry'
584603
- 'perf_evlist__for_each_entry_reverse'
@@ -639,7 +658,6 @@ ForEachMacros:
639658
- 'shost_for_each_device'
640659
- 'sk_for_each'
641660
- 'sk_for_each_bound'
642-
- 'sk_for_each_bound_bhash2'
643661
- 'sk_for_each_entry_offset_rcu'
644662
- 'sk_for_each_from'
645663
- 'sk_for_each_rcu'
@@ -653,6 +671,7 @@ ForEachMacros:
653671
- 'snd_soc_dapm_widget_for_each_path_safe'
654672
- 'snd_soc_dapm_widget_for_each_sink_path'
655673
- 'snd_soc_dapm_widget_for_each_source_path'
674+
- 'sparsebit_for_each_set_range'
656675
- 'strlist__for_each_entry'
657676
- 'strlist__for_each_entry_safe'
658677
- 'sym_for_each_insn'
@@ -662,7 +681,6 @@ ForEachMacros:
662681
- 'tcf_act_for_each_action'
663682
- 'tcf_exts_for_each_action'
664683
- 'ttm_resource_manager_for_each_res'
665-
- 'twsk_for_each_bound_bhash2'
666684
- 'udp_portaddr_for_each_entry'
667685
- 'udp_portaddr_for_each_entry_rcu'
668686
- 'usb_hub_for_each_child'
@@ -686,6 +704,9 @@ ForEachMacros:
686704
- 'xbc_node_for_each_child'
687705
- 'xbc_node_for_each_key_value'
688706
- 'xbc_node_for_each_subkey'
707+
- 'ynl_attr_for_each'
708+
- 'ynl_attr_for_each_nested'
709+
- 'ynl_attr_for_each_payload'
689710
- 'zorro_for_each_dev'
690711

691712
IncludeBlocks: Preserve

.clippy.toml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
3+
check-private-items = true
4+
5+
disallowed-macros = [
6+
# The `clippy::dbg_macro` lint only works with `std::dbg!`, thus we simulate
7+
# it here, see: https://github.com/rust-lang/rust-clippy/issues/11303.
8+
{ path = "kernel::dbg", reason = "the `dbg!` macro is intended as a debugging tool" },
9+
]

.get_maintainer.ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ Alan Cox <[email protected]>
33
Christoph Hellwig <[email protected]>
44
Jeff Kirsher <[email protected]>
55
Marc Gonzalez <[email protected]>
6+
Ralf Baechle <[email protected]>

.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
*.dwo
2525
*.elf
2626
*.gcno
27+
*.gcda
2728
*.gz
2829
*.i
2930
*.ko
@@ -46,7 +47,6 @@
4647
*.so.dbg
4748
*.su
4849
*.symtypes
49-
*.symversions
5050
*.tab.[ch]
5151
*.tar
5252
*.xz
@@ -70,6 +70,7 @@ modules.order
7070
/Module.markers
7171
/modules.builtin
7272
/modules.builtin.modinfo
73+
/modules.builtin.ranges
7374
/modules.nsdeps
7475

7576
#
@@ -102,6 +103,7 @@ modules.order
102103
# We don't want to ignore the following even if they are dot-files
103104
#
104105
!.clang-format
106+
!.clippy.toml
105107
!.cocciconfig
106108
!.editorconfig
107109
!.get_maintainer.ignore
@@ -127,6 +129,7 @@ series
127129

128130
# ctags files
129131
tags
132+
!tags/
130133
TAGS
131134

132135
# cscope files
@@ -142,7 +145,6 @@ GTAGS
142145
# id-utils files
143146
ID
144147

145-
*.orig
146148
*~
147149
\#*#
148150

.mailmap

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ Alexei Avshalom Lazar <[email protected]> <[email protected]>
3737
Alexei Starovoitov <[email protected]> <[email protected]>
3838
Alexei Starovoitov <[email protected]> <[email protected]>
3939
Alexei Starovoitov <[email protected]> <[email protected]>
40+
4041
4142
Alex Elder <[email protected]>
4243
@@ -60,6 +61,7 @@ Amit Nischal <[email protected]> <[email protected]>
6061
6162
6263
Andreas Herrmann <[email protected]>
64+
6365
Andrej Shadura <[email protected]>
6466
6567
Andrew Morton <[email protected]>
@@ -72,6 +74,8 @@ Andrey Ryabinin <[email protected]> <[email protected]>
7274
7375
7476
Andy Adamson <[email protected]>
77+
78+
7579
7680
7781
@@ -153,6 +157,9 @@ Christian Brauner <[email protected]> <[email protected]>
153157
Christian Marangi <[email protected]>
154158
Christophe Ricard <[email protected]>
155159
Christoph Hellwig <[email protected]>
160+
161+
162+
156163
157164
158165
Corey Minyard <[email protected]>
@@ -193,18 +200,23 @@ Elliot Berman <[email protected]> <[email protected]>
193200
Enric Balletbo i Serra <[email protected]> <[email protected]>
194201
Enric Balletbo i Serra <[email protected]> <[email protected]>
195202
196-
203+
204+
197205
Evgeniy Polyakov <[email protected]>
198206
199207
200208
201209
210+
202211
Felipe W Damasio <[email protected]>
203212
Felix Kuhling <[email protected]>
204213
Felix Moeller <[email protected]>
205214
206215
Filipe Lautert <[email protected]>
207216
217+
Fiona Behrens <[email protected]>
218+
219+
208220
Franck Bui-Huu <[email protected]>
209221
210222
@@ -240,6 +252,8 @@ Guru Das Srinagesh <[email protected]> <[email protected]>
240252
Gustavo Padovan <[email protected]>
241253
Gustavo Padovan <[email protected]>
242254
255+
256+
243257
244258
245259
@@ -258,6 +272,7 @@ Jack Pham <[email protected]> <[email protected]>
258272
259273
260274
275+
261276
262277
James Bottomley <jejb@mulgrave.(none)>
263278
James Bottomley <[email protected]>
@@ -269,9 +284,10 @@ James Ketrenos <jketreno@io.(none)>
269284
270285
271286
287+
272288
273289
274-
Jarkko Sakkinen <[email protected]> <jarkko.sakkinen@tuni.fi>
290+
Jarkko Sakkinen <[email protected]> <jarkko.sakkinen@parity.io>
275291
276292
277293
@@ -295,6 +311,11 @@ Jens Axboe <[email protected]> <[email protected]>
295311
296312
Jens Osterkamp <[email protected]>
297313
314+
Jesper Dangaard Brouer <[email protected]> <[email protected]>
315+
Jesper Dangaard Brouer <[email protected]> <[email protected]>
316+
Jesper Dangaard Brouer <[email protected]> <[email protected]>
317+
Jesper Dangaard Brouer <[email protected]> <[email protected]>
318+
Jesper Dangaard Brouer <[email protected]> <[email protected]>
298319
299320
300321
@@ -311,6 +332,7 @@ Jiri Slaby <[email protected]> <[email protected]>
311332
312333
313334
335+
314336
315337
316338
@@ -527,6 +549,7 @@ Pavankumar Kondeti <[email protected]> <[email protected]>
527549
Peter A Jonsson <[email protected]>
528550
Peter Oruba <[email protected]>
529551
Peter Oruba <[email protected]>
552+
Pierre-Louis Bossart <[email protected]> <[email protected]>
530553
531554
Praveen BP <[email protected]>
532555
Pradeep Kumar Chitrapu <[email protected]> <[email protected]>
@@ -610,6 +633,10 @@ Shuah Khan <[email protected]> <[email protected]>
610633
611634
612635
636+
637+
638+
639+
613640
614641
615642
Simon Kelley <[email protected]>
@@ -642,6 +669,7 @@ Tomeu Vizoso <[email protected]> <[email protected]>
642669
Thomas Graf <[email protected]>
643670
644671
Thomas Pedersen <[email protected]>
672+
645673
646674
647675
@@ -706,6 +734,7 @@ Will Deacon <[email protected]> <[email protected]>
706734
707735
708736
737+
709738
Yusuke Goda <[email protected]>
710739
711740

0 commit comments

Comments
 (0)