bpf: add _impl suffix for kfuncs with implicit args

[kernel-patches-daemon-bpf-rc]

Pull request for series with
subject: bpf: add _impl suffix for kfuncs with implicit args
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=1019139

[kernel-patches-daemon-bpf-rc]

Upstream branch: 6146a0f
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=1019139
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/netdevbpf/list/?series=1019139
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: bpf: add _impl suffix for kfuncs with implicit args
Using index info to reconstruct a base tree...
M	kernel/bpf/helpers.c
M	kernel/bpf/stream.c
M	kernel/bpf/verifier.c
A	tools/testing/selftests/bpf/progs/file_reader.c
A	tools/testing/selftests/bpf/progs/verifier_async_cb_context.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): tools/testing/selftests/bpf/progs/verifier_async_cb_context.c deleted in HEAD and modified in bpf: add _impl suffix for kfuncs with implicit args. Version bpf: add _impl suffix for kfuncs with implicit args of tools/testing/selftests/bpf/progs/verifier_async_cb_context.c left in tree.
CONFLICT (modify/delete): tools/testing/selftests/bpf/progs/file_reader.c deleted in HEAD and modified in bpf: add _impl suffix for kfuncs with implicit args. Version bpf: add _impl suffix for kfuncs with implicit args of tools/testing/selftests/bpf/progs/file_reader.c left in tree.
Auto-merging kernel/bpf/verifier.c
Auto-merging kernel/bpf/stream.c
Auto-merging kernel/bpf/helpers.c
CONFLICT (content): Merge conflict in kernel/bpf/helpers.c
Patch failed at 0001 bpf: add _impl suffix for kfuncs with implicit args'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"'

conflict:

diff --cc kernel/bpf/helpers.c
index eb25e70e0bdc,96ea1c7a29be..000000000000
--- a/kernel/bpf/helpers.c
+++ b/kernel/bpf/helpers.c
@@@ -4376,9 -4532,12 +4380,17 @@@ BTF_ID_FLAGS(func, bpf_strnstr)
  #if defined(CONFIG_BPF_LSM) && defined(CONFIG_CGROUPS)
  BTF_ID_FLAGS(func, bpf_cgroup_read_xattr, KF_RCU)
  #endif
++<<<<<<< HEAD
 +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)
++>>>>>>> bpf: add _impl suffix for kfuncs with implicit args
  BTF_KFUNCS_END(common_btf_ids)
  
  static const struct btf_kfunc_id_set common_kfunc_set = {
* Unmerged path tools/testing/selftests/bpf/progs/file_reader.c
* Unmerged path tools/testing/selftests/bpf/progs/verifier_async_cb_context.c