diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-05-07 23:35:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-07 23:35:08 -0400 |
| commit | 01adc4851a8090b46c7a5ed9cfc4b97e65abfbf4 (patch) | |
| tree | 2ae02593d7139962648dff203f3f9701e34ccbc3 /include/linux/bpf_trace.h | |
| parent | liquidio: support use of ethtool to set link speed of CN23XX-225 cards (diff) | |
| parent | bpf, xskmap: fix crash in xsk_map_alloc error path handling (diff) | |
| download | linux-dev-01adc4851a8090b46c7a5ed9cfc4b97e65abfbf4.tar.xz linux-dev-01adc4851a8090b46c7a5ed9cfc4b97e65abfbf4.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Minor conflict, a CHECK was placed into an if() statement
in net-next, whilst a newline was added to that CHECK
call in 'net'. Thanks to Daniel for the merge resolution.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/bpf_trace.h')
| -rw-r--r-- | include/linux/bpf_trace.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/bpf_trace.h b/include/linux/bpf_trace.h index e6fe98ae3794..ddf896abcfb6 100644 --- a/include/linux/bpf_trace.h +++ b/include/linux/bpf_trace.h @@ -2,7 +2,6 @@ #ifndef __LINUX_BPF_TRACE_H__ #define __LINUX_BPF_TRACE_H__ -#include <trace/events/bpf.h> #include <trace/events/xdp.h> #endif /* __LINUX_BPF_TRACE_H__ */ |