Merge branch 'bpf-misc-fixes'

Browse source

Daniel Borkmann says:

====================
Couple of outstanding fixes for BPF tree: 1) fixes a perf RB
corruption, 2) and 3) fixes a few build issues from the recent
bpf_perf_event.h uapi corrections. Thanks!
====================

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

...

This commit is contained in:

Alexei Starovoitov 2017-12-12 09:52:08 -08:00

parent 30791ac419 720f228e8d

commit 9dbd2d948e

4 changed files with 21 additions and 19 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/um/include/asm/Kbuild

View file

19

kernel/trace/bpf_trace.c

View file

7

tools/include/uapi/asm/bpf_perf_event.h

View file

13

tools/testing/selftests/bpf/Makefile

View file