Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 6.18-rc5+

Cross-merge BPF and other fixes after downstream PR.

Minor conflict in kernel/bpf/helpers.c

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc kernel/bpf/helpers.c
index 81ad01eadcf8c0e6031fac113d398db470105fbb,e4007fea49091c01c1d23af55a25f5567417e978..07bfa72f9649357bf441d1f145c79d9de30238be
--- 1/kernel/bpf/helpers.c
--- 2/kernel/bpf/helpers.c
+++ b/kernel/bpf/helpers.c
@@@ -4534,11 -4380,9 +4538,11 @@@ BTF_ID_FLAGS(func, bpf_strncasestr)
  #if defined(CONFIG_BPF_LSM) && defined(CONFIG_CGROUPS)
  BTF_ID_FLAGS(func, bpf_cgroup_read_xattr, KF_RCU)
  #endif
- BTF_ID_FLAGS(func, bpf_stream_vprintk, KF_TRUSTED_ARGS)
- BTF_ID_FLAGS(func, bpf_task_work_schedule_signal, KF_TRUSTED_ARGS)
- BTF_ID_FLAGS(func, bpf_task_work_schedule_resume, KF_TRUSTED_ARGS)
+ BTF_ID_FLAGS(func, bpf_stream_vprintk_impl, KF_TRUSTED_ARGS)
+ BTF_ID_FLAGS(func, bpf_task_work_schedule_signal_impl, KF_TRUSTED_ARGS)
+ BTF_ID_FLAGS(func, bpf_task_work_schedule_resume_impl, KF_TRUSTED_ARGS)
 +BTF_ID_FLAGS(func, bpf_dynptr_from_file, KF_TRUSTED_ARGS)
 +BTF_ID_FLAGS(func, bpf_dynptr_file_discard)
  BTF_KFUNCS_END(common_btf_ids)
  
  static const struct btf_kfunc_id_set common_kfunc_set = {

diff --cc kernel/bpf/stream.c
Simple merge

diff --cc kernel/bpf/trampoline.c
Simple merge

diff --cc kernel/bpf/verifier.c
index 99d62d765b2411279417e234e7a7a43efca1e898,fbe4bb91c564ae36cc56ed4f121e59b718049ebf..10d24073c692d9f436f52a975dfc771bb99674b6
--- 1/kernel/bpf/verifier.c
--- 2/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@@ -12315,11 -12260,9 +12317,11 @@@ enum special_kfunc_type 
        KF_bpf_res_spin_unlock,
        KF_bpf_res_spin_lock_irqsave,
        KF_bpf_res_spin_unlock_irqrestore,
 +      KF_bpf_dynptr_from_file,
 +      KF_bpf_dynptr_file_discard,
        KF___bpf_trap,
-       KF_bpf_task_work_schedule_signal,
-       KF_bpf_task_work_schedule_resume,
+       KF_bpf_task_work_schedule_signal_impl,
+       KF_bpf_task_work_schedule_resume_impl,
  };
  
  BTF_ID_LIST(special_kfunc_list)
@@@ -12389,11 -12332,9 +12391,11 @@@ BTF_ID(func, bpf_res_spin_lock
  BTF_ID(func, bpf_res_spin_unlock)
  BTF_ID(func, bpf_res_spin_lock_irqsave)
  BTF_ID(func, bpf_res_spin_unlock_irqrestore)
 +BTF_ID(func, bpf_dynptr_from_file)
 +BTF_ID(func, bpf_dynptr_file_discard)
  BTF_ID(func, __bpf_trap)
- BTF_ID(func, bpf_task_work_schedule_signal)
- BTF_ID(func, bpf_task_work_schedule_resume)
+ BTF_ID(func, bpf_task_work_schedule_signal_impl)
+ BTF_ID(func, bpf_task_work_schedule_resume_impl)
  
  static bool is_task_work_add_kfunc(u32 func_id)
  {