diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-12-18 22:30:33 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-12-18 22:30:33 -0800 |
| commit | 3061169a47ee3572af6de78887222b6d03771621 (patch) | |
| tree | 1af7584db99d958ab7b88ada192f90b05a782a66 /include/uapi | |
| parent | net/smc: fix TCP fallback socket release (diff) | |
| parent | bpf: promote bpf_perf_event.h to mandatory UAPI header (diff) | |
| download | linux-dev-3061169a47ee3572af6de78887222b6d03771621.tar.xz linux-dev-3061169a47ee3572af6de78887222b6d03771621.zip | |
Merge git://git.kernel.org/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>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/asm-generic/Kbuild.asm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild.asm index 21381449d98a..355c4ac2c0b0 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild.asm @@ -3,6 +3,7 @@ # mandatory-y += auxvec.h mandatory-y += bitsperlong.h +mandatory-y += bpf_perf_event.h mandatory-y += byteorder.h mandatory-y += errno.h mandatory-y += fcntl.h |