From: David S. Miller <davem@davemloft.net>
Date: Wed, 19 Dec 2018 06:30:33 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3061169a47ee3572af6de78887222b6d03771621;p=linux.git

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

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>
---

3061169a47ee3572af6de78887222b6d03771621