diff options
| author | David S. Miller <davem@davemloft.net> | 2018-02-23 12:34:18 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-23 12:34:18 -0500 |
| commit | 22170094437b4ae2308944bb3ec0fe7ebe45f4a1 (patch) | |
| tree | 1dabdfd03e42add165db06554c069800eabd3d3a /tools/testing/selftests/bpf/test_tcpbpf_kern.c | |
| parent | d903ec77118c09f93a610b384d83a6df33a64fe6 (diff) | |
| parent | 16338a9b3ac30740d49f5dfed81bac0ffa53b9c7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2018-02-22
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) two urgent fixes for bpf_tail_call logic for x64 and arm64 JITs, from Daniel.
2) cond_resched points in percpu array alloc/free paths, from Eric.
3) lockdep and other minor fixes, from Yonghong, Arnd, Anders, Li.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/testing/selftests/bpf/test_tcpbpf_kern.c')
| -rw-r--r-- | tools/testing/selftests/bpf/test_tcpbpf_kern.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/testing/selftests/bpf/test_tcpbpf_kern.c b/tools/testing/selftests/bpf/test_tcpbpf_kern.c index 57119ad57a3f..3e645ee41ed5 100644 --- a/tools/testing/selftests/bpf/test_tcpbpf_kern.c +++ b/tools/testing/selftests/bpf/test_tcpbpf_kern.c @@ -5,7 +5,6 @@ #include <linux/if_ether.h> #include <linux/if_packet.h> #include <linux/ip.h> -#include <linux/in6.h> #include <linux/types.h> #include <linux/socket.h> #include <linux/tcp.h> |