]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after rc3
authorAlexei Starovoitov <ast@kernel.org>
Thu, 26 Jun 2025 16:48:06 +0000 (09:48 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Thu, 26 Jun 2025 16:49:39 +0000 (09:49 -0700)
Cross-merge BPF, perf and other fixes after downstream PRs.
It restores BPF CI to green after critical fix
commit bc4394e5e79c ("perf: Fix the throttle error of some clock events")

No conflicts.

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
1  2 
include/uapi/linux/bpf.h
kernel/bpf/cgroup.c
kernel/bpf/verifier.c
tools/include/uapi/linux/bpf.h
tools/lib/bpf/btf_dump.c
tools/lib/bpf/libbpf.c
tools/testing/selftests/bpf/Makefile

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge