Hi all,

Today's linux-next merge of the bpf-next tree got a conflict in:

  kernel/bpf/helpers.c

between commits:

  ea0714d61dea ("bpf:add _impl suffix for bpf_task_work_schedule* kfuncs")
  137cc92ffe2e ("bpf: add _impl suffix for bpf_stream_vprintk() kfunc")

from the bpf tree and commit:

  8d8771dc03e4 ("bpf: add plumbing for file-backed dynptr")

from the bpf-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--
Cheers,
Stephen Rothwell

diff --cc kernel/bpf/helpers.c
index e4007fea4909,865b0dae38d1..000000000000

--- a/kernel/bpf/helpers.c
+++ b/kernel/bpf/helpers.c

@@@ -4380,9 -4531,11 +4535,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)