Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf bpf-6.14-rc4

Cross-merge bpf fixes after downstream PR (bpf-6.14-rc4).

Minor conflict:
  kernel/bpf/btf.c
Adjacent changes:
  kernel/bpf/arena.c
  kernel/bpf/btf.c
  kernel/bpf/syscall.c
  kernel/bpf/verifier.c
  mm/memory.c

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

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

diff --cc kernel/bpf/btf.c
index 69f5752e880bebfd397412e0ea8ec79baba8f0f9,c3223e0db2f51834caf31a420d51f6ea3da71c63..12426e10baf3042ddec23ef2ce42d1925b651152
--- 1/kernel/bpf/btf.c
--- 2/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@@ -6505,8 -6507,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/syscall.c
Simple merge

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

diff --cc mm/memory.c
Simple merge