From: David Ahern <dsahern@gmail.com>
Date: Wed, 16 Dec 2020 04:06:06 +0000 (+0000)
Subject: Merge branch 'main' into next
X-Git-Tag: v5.11.0~32^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c01dec8475e84246a455d51c95e4dfb0ba267f55;p=thirdparty%2Fiproute2.git

Merge branch 'main' into next

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

c01dec8475e84246a455d51c95e4dfb0ba267f55
diff --cc include/uapi/linux/bpf.h
index 027f91ec2,21f967a22..0981d0a3e
--- a/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