Commit 52c996d3 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'torvalds/master' into perf-tools 



To pick up changes in other trees that may affect perf, such as libbpf
and in general the header files that perf has copies of, so that we can
do the sync with the kernel sources.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents 5363c306 eee28084

.clang-format

+30 −9
Original line number Diff line number Diff line
@@ -141,11 +141,13 @@ ForEachMacros: 
  - 'damon_for_each_target_safe'

  - 'damos_for_each_filter'

  - 'damos_for_each_filter_safe'

  - 'damos_for_each_quota_goal'

  - 'damos_for_each_quota_goal_safe'

  - 'data__for_each_file'

  - 'data__for_each_file_new'

  - 'data__for_each_file_start'

  - 'device_for_each_child_node'

  - 'displayid_iter_for_each'

  - 'device_for_each_child_node_scoped'

  - 'dma_fence_array_for_each'

  - 'dma_fence_chain_for_each'

  - 'dma_fence_unwrap_for_each'
@@ -172,11 +174,14 @@ ForEachMacros: 
  - 'drm_for_each_plane'

  - 'drm_for_each_plane_mask'

  - 'drm_for_each_privobj'

  - 'drm_gem_for_each_gpuva'

  - 'drm_gem_for_each_gpuva_safe'

  - 'drm_gem_for_each_gpuvm_bo'

  - 'drm_gem_for_each_gpuvm_bo_safe'

  - 'drm_gpuva_for_each_op'

  - 'drm_gpuva_for_each_op_from_reverse'

  - 'drm_gpuva_for_each_op_reverse'

  - 'drm_gpuva_for_each_op_safe'

  - 'drm_gpuvm_bo_for_each_va'

  - 'drm_gpuvm_bo_for_each_va_safe'

  - 'drm_gpuvm_for_each_va'

  - 'drm_gpuvm_for_each_va_range'

  - 'drm_gpuvm_for_each_va_range_safe'
@@ -192,11 +197,11 @@ ForEachMacros: 
  - 'dsa_switch_for_each_port_continue_reverse'

  - 'dsa_switch_for_each_port_safe'

  - 'dsa_switch_for_each_user_port'

  - 'dsa_switch_for_each_user_port_continue_reverse'

  - 'dsa_tree_for_each_cpu_port'

  - 'dsa_tree_for_each_user_port'

  - 'dsa_tree_for_each_user_port_continue_reverse'

  - 'dso__for_each_symbol'

  - 'dsos__for_each_with_build_id'

  - 'elf_hash_for_each_possible'

  - 'elf_symtab__for_each_symbol'

  - 'evlist__for_each_cpu'
@@ -216,6 +221,7 @@ ForEachMacros: 
  - 'for_each_and_bit'

  - 'for_each_andnot_bit'

  - 'for_each_available_child_of_node'

  - 'for_each_available_child_of_node_scoped'

  - 'for_each_bench'

  - 'for_each_bio'

  - 'for_each_board_func_rsrc'
@@ -234,6 +240,7 @@ ForEachMacros: 
  - 'for_each_card_widgets_safe'

  - 'for_each_cgroup_storage_type'

  - 'for_each_child_of_node'

  - 'for_each_child_of_node_scoped'

  - 'for_each_clear_bit'

  - 'for_each_clear_bit_from'

  - 'for_each_clear_bitrange'
@@ -251,6 +258,7 @@ ForEachMacros: 
  - 'for_each_cpu'

  - 'for_each_cpu_and'

  - 'for_each_cpu_andnot'

  - 'for_each_cpu_from'

  - 'for_each_cpu_or'

  - 'for_each_cpu_wrap'

  - 'for_each_dapm_widgets'
@@ -269,13 +277,14 @@ ForEachMacros: 
  - 'for_each_element'

  - 'for_each_element_extid'

  - 'for_each_element_id'

  - 'for_each_enabled_cpu'

  - 'for_each_endpoint_of_node'

  - 'for_each_event'

  - 'for_each_event_tps'

  - 'for_each_evictable_lru'

  - 'for_each_fib6_node_rt_rcu'

  - 'for_each_fib6_walker_rt'

  - 'for_each_free_mem_pfn_range_in_zone'

  - 'for_each_file_lock'

  - 'for_each_free_mem_pfn_range_in_zone_from'

  - 'for_each_free_mem_range'

  - 'for_each_free_mem_range_reverse'
@@ -286,15 +295,18 @@ ForEachMacros: 
  - 'for_each_group_member'

  - 'for_each_group_member_head'

  - 'for_each_hstate'

  - 'for_each_hwgpio'

  - 'for_each_if'

  - 'for_each_inject_fn'

  - 'for_each_insn'

  - 'for_each_insn_op_loc'

  - 'for_each_insn_prefix'

  - 'for_each_intid'

  - 'for_each_iommu'

  - 'for_each_ip_tunnel_rcu'

  - 'for_each_irq_nr'

  - 'for_each_lang'

  - 'for_each_link_ch_maps'

  - 'for_each_link_codecs'

  - 'for_each_link_cpus'

  - 'for_each_link_platforms'
@@ -332,6 +344,9 @@ ForEachMacros: 
  - 'for_each_new_plane_in_state_reverse'

  - 'for_each_new_private_obj_in_state'

  - 'for_each_new_reg'

  - 'for_each_nhlt_endpoint'

  - 'for_each_nhlt_endpoint_fmtcfg'

  - 'for_each_nhlt_fmtcfg'

  - 'for_each_node'

  - 'for_each_node_by_name'

  - 'for_each_node_by_type'
@@ -387,12 +402,15 @@ ForEachMacros: 
  - 'for_each_reloc_from'

  - 'for_each_requested_gpio'

  - 'for_each_requested_gpio_in_range'

  - 'for_each_reserved_child_of_node'

  - 'for_each_reserved_mem_range'

  - 'for_each_reserved_mem_region'

  - 'for_each_rtd_ch_maps'

  - 'for_each_rtd_codec_dais'

  - 'for_each_rtd_components'

  - 'for_each_rtd_cpu_dais'

  - 'for_each_rtd_dais'

  - 'for_each_rtd_dais_reverse'

  - 'for_each_sband_iftype_data'

  - 'for_each_script'

  - 'for_each_sec'
@@ -533,8 +551,6 @@ ForEachMacros: 
  - 'lwq_for_each_safe'

  - 'map__for_each_symbol'

  - 'map__for_each_symbol_by_name'

  - 'maps__for_each_entry'

  - 'maps__for_each_entry_safe'

  - 'mas_for_each'

  - 'mci_for_each_dimm'

  - 'media_device_for_each_entity'
@@ -560,7 +576,9 @@ ForEachMacros: 
  - 'netdev_hw_addr_list_for_each'

  - 'nft_rule_for_each_expr'

  - 'nla_for_each_attr'

  - 'nla_for_each_attr_type'

  - 'nla_for_each_nested'

  - 'nla_for_each_nested_type'

  - 'nlmsg_for_each_attr'

  - 'nlmsg_for_each_msg'

  - 'nr_neigh_for_each'
@@ -579,6 +597,7 @@ ForEachMacros: 
  - 'perf_config_sections__for_each_entry'

  - 'perf_config_set__for_each_entry'

  - 'perf_cpu_map__for_each_cpu'

  - 'perf_cpu_map__for_each_cpu_skip_any'

  - 'perf_cpu_map__for_each_idx'

  - 'perf_evlist__for_each_entry'

  - 'perf_evlist__for_each_entry_reverse'
@@ -639,7 +658,6 @@ ForEachMacros: 
  - 'shost_for_each_device'

  - 'sk_for_each'

  - 'sk_for_each_bound'

  - 'sk_for_each_bound_bhash2'

  - 'sk_for_each_entry_offset_rcu'

  - 'sk_for_each_from'

  - 'sk_for_each_rcu'
@@ -653,6 +671,7 @@ ForEachMacros: 
  - 'snd_soc_dapm_widget_for_each_path_safe'

  - 'snd_soc_dapm_widget_for_each_sink_path'

  - 'snd_soc_dapm_widget_for_each_source_path'

  - 'sparsebit_for_each_set_range'

  - 'strlist__for_each_entry'

  - 'strlist__for_each_entry_safe'

  - 'sym_for_each_insn'
@@ -662,7 +681,6 @@ ForEachMacros: 
  - 'tcf_act_for_each_action'

  - 'tcf_exts_for_each_action'

  - 'ttm_resource_manager_for_each_res'

  - 'twsk_for_each_bound_bhash2'

  - 'udp_portaddr_for_each_entry'

  - 'udp_portaddr_for_each_entry_rcu'

  - 'usb_hub_for_each_child'
@@ -686,6 +704,9 @@ ForEachMacros: 
  - 'xbc_node_for_each_child'

  - 'xbc_node_for_each_key_value'

  - 'xbc_node_for_each_subkey'

  - 'ynl_attr_for_each'

  - 'ynl_attr_for_each_nested'

  - 'ynl_attr_for_each_payload'

  - 'zorro_for_each_dev'



IncludeBlocks: Preserve

.gitignore

+1 −2
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 
*.so.dbg

*.su

*.symtypes

*.symversions

*.tab.[ch]

*.tar

*.xz
@@ -71,6 +70,7 @@ modules.order 
/Module.markers

/modules.builtin

/modules.builtin.modinfo

/modules.builtin.ranges

/modules.nsdeps



#
@@ -143,7 +143,6 @@ GTAGS 
# id-utils files

ID



*.orig

*~

\#*#

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -154,6 +154,9 @@ Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com> 
Christian Marangi <ansuelsmth@gmail.com>

Christophe Ricard <christophe.ricard@gmail.com>

Christoph Hellwig <hch@lst.de>

Chuck Lever <chuck.lever@oracle.com> <cel@kernel.org>

Chuck Lever <chuck.lever@oracle.com> <cel@netapp.com>

Chuck Lever <chuck.lever@oracle.com> <cel@citi.umich.edu>

Claudiu Beznea <claudiu.beznea@tuxon.dev> <claudiu.beznea@microchip.com>

Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>

Corey Minyard <minyard@acm.org>
@@ -313,6 +316,7 @@ Jiri Slaby <jirislaby@kernel.org> <xslaby@fi.muni.cz> 
Jisheng Zhang <jszhang@kernel.org> <jszhang@marvell.com>

Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>

Jishnu Prakash <quic_jprakash@quicinc.com> <jprakash@codeaurora.org>

Joel Granados <joel.granados@kernel.org> <j.granados@samsung.com>

Johan Hovold <johan@kernel.org> <jhovold@gmail.com>

Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>

John Crispin <john@phrozen.org> <blogic@openwrt.org>

Documentation/ABI/stable/sysfs-bus-nvmem

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ Description: 
		Read returns '0' or '1' for read-write or read-only modes

		respectively.

		Write parses one of 'YyTt1NnFf0', or [oO][NnFf] for "on"

		and "off", i.e. what kstrbool() supports.

		and "off", i.e. what kstrtobool() supports.

		Note: This file is only present if CONFIG_NVMEM_SYSFS

		is enabled.

Documentation/ABI/testing/configfs-usb-gadget-acm

+7 −0
Original line number Diff line number Diff line
@@ -6,3 +6,10 @@ Description: 
		This item contains just one readonly attribute: port_num.

		It contains the port number of the /dev/ttyGS<n> device

		associated with acm function's instance "name".



What:		/config/usb-gadget/gadget/functions/acm.name/protocol

Date:		Aug 2024

KernelVersion:	6.13

Description:

		Reported bInterfaceProtocol for the ACM device. For legacy

		reasons, this defaults to 1 (USB_CDC_ACM_PROTO_AT_V25TER).