Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf...

# Conflicts:
#	kernel/bpf/btf.c

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

diff --cc kernel/bpf/btf.c
index c3223e0db2f51834caf31a420d51f6ea3da71c63,f8335bdc8bf86be84f4567441a743996b91e1a1e..28a611cc98414d6b500be515a11d9a2202f4b282
--- 1/kernel/bpf/btf.c
--- 2/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@@ -6507,8 -6505,8 +6505,10 @@@ static const struct bpf_raw_tp_null_arg
        /* rxrpc */
        { "rxrpc_recvdata", 0x1 },
        { "rxrpc_resend", 0x10 },
+       { "rxrpc_tq", 0x10 },
+       { "rxrpc_client", 0x1 },
 +      /* skb */
 +      {"kfree_skb", 0x1000},
        /* sunrpc */
        { "xs_stream_read_data", 0x1 },
        /* ... from xprt_cong_event event class */

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