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)
commit148709bc278a2e49ff7b10cee2d8cdc33b894598
treec27a039d9886cae1572f81d80e35af60bf9cd740
parent24dee0c7478d1a1e00abdf5625b7f921467325dc
parentfe3300897cbfd76c6cb825776e5ac0ca50a91ca4
Merge git://git./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>