Merge branch 'main' into next

Signed-off-by: David Ahern <dsahern@gmail.com>

diff --cc devlink/devlink.c
Simple merge

diff --cc include/uapi/linux/bpf.h
index 027f91ec267c697730265d166610b073532f7695,21f967a2263d5b2c6a382bd9abf77484a771c30a..0981d0a3e7099283aeecb031c26808a252ece783
--- 1/include/uapi/linux/bpf.h
--- 2/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@@ -3977,15 -3897,9 +3977,15 @@@ union bpf_attr 
        FN(seq_printf_btf),             \
        FN(skb_cgroup_classid),         \
        FN(redirect_neigh),             \
-       FN(bpf_per_cpu_ptr),            \
-       FN(bpf_this_cpu_ptr),           \
+       FN(per_cpu_ptr),                \
+       FN(this_cpu_ptr),               \
        FN(redirect_peer),              \
 +      FN(task_storage_get),           \
 +      FN(task_storage_delete),        \
 +      FN(get_current_task_btf),       \
 +      FN(bprm_opts_set),              \
 +      FN(ktime_get_coarse_ns),        \
 +      FN(ima_inode_hash),             \
        /* */
  
  /* integer value in 'imm' field of BPF_CALL instruction selects which helper

diff --cc tc/m_pedit.c
Simple merge