diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-16 11:57:53 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-16 11:57:53 +0100 |
| commit | a47b66da0380dd1ebcf2fbfa5fc41c4b6af8a460 (patch) | |
| tree | 3e1e18183f2041d534a1a763af95df1ec460e044 /samples/bpf/trace_output_user.c | |
| parent | USB: Increase usbfs transfer limit (diff) | |
| parent | Linux 4.10-rc4 (diff) | |
| download | wireguard-linux-a47b66da0380dd1ebcf2fbfa5fc41c4b6af8a460.tar.xz wireguard-linux-a47b66da0380dd1ebcf2fbfa5fc41c4b6af8a460.zip | |
Merge 4.10-rc4 into usb-next
We need the USB fixes in here to make merges easier/possible with the
other sub-maintainer USB trees.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'samples/bpf/trace_output_user.c')
| -rw-r--r-- | samples/bpf/trace_output_user.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/samples/bpf/trace_output_user.c b/samples/bpf/trace_output_user.c index f4fa6af22def..ccca1e348017 100644 --- a/samples/bpf/trace_output_user.c +++ b/samples/bpf/trace_output_user.c @@ -9,7 +9,6 @@ #include <string.h> #include <fcntl.h> #include <poll.h> -#include <sys/ioctl.h> #include <linux/perf_event.h> #include <linux/bpf.h> #include <errno.h> |