Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

Alexei Starovoitov says: ==================== pull-request: bpf 2019-12-11 The following pull-request contains BPF updates for your *net* tree. We've added 8 non-merge commits during the last 1 day(s) which contain a total of 10 files changed, 126 insertions(+), 18 deletions(-). The main changes are: 1) Make BPF trampoline co-exist with ftrace-based tracers, from Alexei. 2) Fix build in minimal configurations, from Arnd. 3) Fix mips, riscv bpf_tail_call limit, from Paul. 4) Fix bpftool segfault, from Toke. 5) Fix samples/bpf, from Daniel. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2026-10-12 06:01:58 +00:00 · 2019-12-11 20:13:45 -08:00 · 2019-12-11 20:13:45 -08:00 · 148709bc27
commit 148709bc27
parent 24dee0c747 fe3300897c
10 changed files with 126 additions and 18 deletions
--- a/arch/mips/net/ebpf_jit.c
+++ b/arch/mips/net/ebpf_jit.c
--- a/arch/riscv/net/bpf_jit_comp.c
+++ b/arch/riscv/net/bpf_jit_comp.c
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
--- a/kernel/bpf/trampoline.c
+++ b/kernel/bpf/trampoline.c
--- a/samples/bpf/syscall_tp_kern.c
+++ b/samples/bpf/syscall_tp_kern.c
--- a/samples/bpf/trace_event_user.c
+++ b/samples/bpf/trace_event_user.c
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
--- a/tools/bpf/bpftool/xlated_dumper.c
+++ b/tools/bpf/bpftool/xlated_dumper.c
--- a/tools/testing/selftests/bpf/test_ftrace.sh
+++ b/tools/testing/selftests/bpf/test_ftrace.sh