Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
authorDavid S. Miller <davem@davemloft.net>
Wed, 19 Dec 2018 06:30:33 +0000 (22:30 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 19 Dec 2018 06:30:33 +0000 (22:30 -0800)
Alexei Starovoitov says:

====================
pull-request: bpf 2018-12-18

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

The main changes are:

1) promote bpf_perf_event.h to mandatory UAPI header, from Masahiro.
====================

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

Trivial merge