Merge branch 'vfs-6.17.bpf' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

Merge branch 'vfs-6.17.bpf' from vfs tree into bpf-next/master
and resolve conflicts.

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

diff --cc kernel/bpf/helpers.c
index 2cdcf7b2c91e8c440ff7bf3362487cddd33d52f4,9ff1b40902898d10a6357552aa0840d3cb095387..6d051416c18466d219dcd071174901ee7776a5f5
--- 1/kernel/bpf/helpers.c
--- 2/kernel/bpf/helpers.c
+++ b/kernel/bpf/helpers.c
@@@ -3768,17 -3397,9 +3768,20 @@@ BTF_ID_FLAGS(func, bpf_iter_dmabuf_next
  BTF_ID_FLAGS(func, bpf_iter_dmabuf_destroy, KF_ITER_DESTROY | KF_SLEEPABLE)
  #endif
  BTF_ID_FLAGS(func, __bpf_trap)
 +BTF_ID_FLAGS(func, bpf_strcmp);
 +BTF_ID_FLAGS(func, bpf_strchr);
 +BTF_ID_FLAGS(func, bpf_strchrnul);
 +BTF_ID_FLAGS(func, bpf_strnchr);
 +BTF_ID_FLAGS(func, bpf_strrchr);
 +BTF_ID_FLAGS(func, bpf_strlen);
 +BTF_ID_FLAGS(func, bpf_strnlen);
 +BTF_ID_FLAGS(func, bpf_strspn);
 +BTF_ID_FLAGS(func, bpf_strcspn);
 +BTF_ID_FLAGS(func, bpf_strstr);
 +BTF_ID_FLAGS(func, bpf_strnstr);
+ #ifdef CONFIG_CGROUPS
+ BTF_ID_FLAGS(func, bpf_cgroup_read_xattr, KF_RCU)
+ #endif
  BTF_KFUNCS_END(common_btf_ids)
  
  static const struct btf_kfunc_id_set common_kfunc_set = {

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