Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
authorDavid S. Miller <davem@davemloft.net>
Fri, 1 Feb 2019 23:28:07 +0000 (15:28 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 1 Feb 2019 23:28:07 +0000 (15:28 -0800)
Alexei Starovoitov says:

====================
pull-request: bpf 2019-01-31

The following pull-request contains BPF updates for your *net* tree.

The main changes are:

1) disable preemption in sender side of socket filters, from Alexei.

2) fix two potential deadlocks in syscall bpf lookup and prog_register,
   from Martin and Alexei.

3) fix BTF to allow typedef on func_proto, from Yonghong.

4) two bpftool fixes, from Jiri and Paolo.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge