]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
authorDavid S. Miller <davem@davemloft.net>
Thu, 12 Dec 2019 04:13:45 +0000 (20:13 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 12 Dec 2019 04:13:45 +0000 (20:13 -0800)
commit993dbfdc3e50ecfe8c326a298232a68b546b0ad0
treec27a039d9886cae1572f81d80e35af60bf9cd740
parentbbc39bbe1f3b6e9998ecd061bf5447a92ea880bc
parentbc9e619accb60bdf82fbeca678f2d1fe28b4f94c
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>