Skip to content

Commit 4b41932

Browse files
committed
Merge branch 'next' into for-linus
Prepare input updates for 5.11 merge window.
2 parents cffdd6d + 92f0a3a commit 4b41932

24,132 files changed

Lines changed: 1594807 additions & 578331 deletions

File tree

Some content is hidden

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

.clang-format

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ ForEachMacros:
8080
- 'ax25_uid_for_each'
8181
- '__bio_for_each_bvec'
8282
- 'bio_for_each_bvec'
83+
- 'bio_for_each_bvec_all'
8384
- 'bio_for_each_integrity_vec'
8485
- '__bio_for_each_segment'
8586
- 'bio_for_each_segment'
@@ -110,6 +111,7 @@ ForEachMacros:
110111
- 'css_for_each_descendant_pre'
111112
- 'device_for_each_child_node'
112113
- 'dma_fence_chain_for_each'
114+
- 'do_for_each_ftrace_op'
113115
- 'drm_atomic_crtc_for_each_plane'
114116
- 'drm_atomic_crtc_state_for_each_plane'
115117
- 'drm_atomic_crtc_state_for_each_plane_state'
@@ -135,6 +137,7 @@ ForEachMacros:
135137
- 'for_each_active_dev_scope'
136138
- 'for_each_active_drhd_unit'
137139
- 'for_each_active_iommu'
140+
- 'for_each_aggr_pgid'
138141
- 'for_each_available_child_of_node'
139142
- 'for_each_bio'
140143
- 'for_each_board_func_rsrc'
@@ -233,6 +236,7 @@ ForEachMacros:
233236
- 'for_each_node_state'
234237
- 'for_each_node_with_cpus'
235238
- 'for_each_node_with_property'
239+
- 'for_each_nonreserved_multicast_dest_pgid'
236240
- 'for_each_of_allnodes'
237241
- 'for_each_of_allnodes_from'
238242
- 'for_each_of_cpu_node'
@@ -255,6 +259,7 @@ ForEachMacros:
255259
- 'for_each_pci_dev'
256260
- 'for_each_pci_msi_entry'
257261
- 'for_each_pcm_streams'
262+
- 'for_each_physmem_range'
258263
- 'for_each_populated_zone'
259264
- 'for_each_possible_cpu'
260265
- 'for_each_present_cpu'
@@ -264,6 +269,8 @@ ForEachMacros:
264269
- 'for_each_process_thread'
265270
- 'for_each_property_of_node'
266271
- 'for_each_registered_fb'
272+
- 'for_each_requested_gpio'
273+
- 'for_each_requested_gpio_in_range'
267274
- 'for_each_reserved_mem_region'
268275
- 'for_each_rtd_codec_dais'
269276
- 'for_each_rtd_codec_dais_rollback'
@@ -277,12 +284,17 @@ ForEachMacros:
277284
- 'for_each_sg'
278285
- 'for_each_sg_dma_page'
279286
- 'for_each_sg_page'
287+
- 'for_each_sgtable_dma_page'
288+
- 'for_each_sgtable_dma_sg'
289+
- 'for_each_sgtable_page'
290+
- 'for_each_sgtable_sg'
280291
- 'for_each_sibling_event'
281292
- 'for_each_subelement'
282293
- 'for_each_subelement_extid'
283294
- 'for_each_subelement_id'
284295
- '__for_each_thread'
285296
- 'for_each_thread'
297+
- 'for_each_unicast_dest_pgid'
286298
- 'for_each_wakeup_source'
287299
- 'for_each_zone'
288300
- 'for_each_zone_zonelist'
@@ -463,6 +475,7 @@ ForEachMacros:
463475
- 'v4l2_m2m_for_each_src_buf'
464476
- 'v4l2_m2m_for_each_src_buf_safe'
465477
- 'virtio_device_for_each_vq'
478+
- 'while_for_each_ftrace_op'
466479
- 'xa_for_each'
467480
- 'xa_for_each_marked'
468481
- 'xa_for_each_range'

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
*.tab.[ch]
4545
*.tar
4646
*.xz
47+
*.zst
4748
Module.symvers
4849
modules.builtin
4950
modules.order
@@ -56,6 +57,7 @@ modules.order
5657
/linux
5758
/vmlinux
5859
/vmlinux.32
60+
/vmlinux.symvers
5961
/vmlinux-gdb.py
6062
/vmlinuz
6163
/System.map
@@ -142,6 +144,9 @@ x509.genkey
142144
/allrandom.config
143145
/allyes.config
144146

147+
# Kconfig savedefconfig output
148+
/defconfig
149+
145150
# Kdevelop4
146151
*.kdev4
147152

.mailmap

Lines changed: 94 additions & 57 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)