Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
authorAlexei Starovoitov <ast@kernel.org>
Thu, 22 Aug 2024 16:27:59 +0000 (09:27 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Thu, 22 Aug 2024 16:48:44 +0000 (09:48 -0700)
Cross-merge bpf fixes after downstream PR including
important fixes (from bpf-next point of view):
commit 41c24102af7b ("selftests/bpf: Filter out _GNU_SOURCE when compiling test_cpp")
commit fdad456cbcca ("bpf: Fix updating attached freplace prog in prog_array map")

No conflicts.

Adjacent changes in:
include/linux/bpf_verifier.h
kernel/bpf/verifier.c
tools/testing/selftests/bpf/Makefile

Link: https://lore.kernel.org/bpf/20240813234307.82773-1-alexei.starovoitov@gmail.com/
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
1  2 
include/linux/bpf_verifier.h
kernel/bpf/verifier.c
tools/testing/selftests/bpf/Makefile

Simple merge
Simple merge
Simple merge