]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
authorAlexei Starovoitov <ast@kernel.org>
Fri, 25 Oct 2024 01:45:59 +0000 (18:45 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Fri, 25 Oct 2024 01:47:28 +0000 (18:47 -0700)
commitbfa7b5c98be4bdcf8aaa4e5ca0b91359ea28c05c
tree751b70005cb6641c42e90191f35dac731459a6ec
parentc6fb8030b4baa01c850f99fc6da051b1017edc46
parentae90f6a6170d7a7a1aa4fddf664fbd093e3023bc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

Cross-merge bpf fixes after downstream PR.

No conflicts.

Adjacent changes in:

include/linux/bpf.h
include/uapi/linux/bpf.h
kernel/bpf/btf.c
kernel/bpf/helpers.c
kernel/bpf/syscall.c
kernel/bpf/verifier.c
kernel/trace/bpf_trace.c
mm/slab_common.c
tools/include/uapi/linux/bpf.h
tools/testing/selftests/bpf/Makefile

Link: https://lore.kernel.org/all/20241024215724.60017-1-daniel@iogearbox.net/
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
include/linux/bpf.h
include/uapi/linux/bpf.h
kernel/bpf/btf.c
kernel/bpf/helpers.c
kernel/bpf/syscall.c
kernel/bpf/verifier.c
kernel/trace/bpf_trace.c
mm/slab_common.c
tools/include/uapi/linux/bpf.h
tools/testing/selftests/bpf/Makefile