David S. Miller 3118e6e19d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The UDP offload conflict is dealt with by simply taking what is in net-next where we have removed all of the UFO handling code entirely. The TCP conflict was a case of local variables in a function being removed from both net and net-next. In netvsc we had an assignment right next to where a missing set of u64 stats sync object inits were added. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-08-09 16:28:45 -07:00
..
gnu	selftests/bpf: get rid of -D__x86_64__	2017-05-03 09:51:25 -04:00
include/uapi/linux	selftests/bpf: fix broken build due to types.h	2017-05-17 18:45:14 -04:00
.gitignore	bpf: Add test_tag to .gitignore	2017-02-10 15:56:08 -05:00
bpf_endian.h	samples/bpf: fix a build issue	2017-07-11 20:51:29 -07:00
bpf_helpers.h	xdp: bpf redirect with map sample program	2017-07-17 09:48:06 -07:00
bpf_util.h	bpf: Move endianness BPF helpers out of bpf_util.h	2017-05-01 12:43:49 -07:00
config
Makefile	selftests: bpf: add a test for XDP redirect	2017-08-08 18:12:50 -07:00
test_align.c	selftests/bpf: add tests for subtraction & negative numbers	2017-08-08 17:51:35 -07:00
test_iptunnel_common.h	selftests/bpf: add a test for basic XDP functionality	2017-04-01 12:45:57 -07:00
test_kmod.sh
test_l4lb.c	bpf: Move endianness BPF helpers out of bpf_util.h	2017-05-01 12:43:49 -07:00
test_lpm_map.c	bpf: Remove bpf_sys.h from selftests	2017-02-10 15:56:08 -05:00
test_lru_map.c	bpf: lru: Lower the PERCPU_NR_SCANS from 16 to 4	2017-04-17 13:55:52 -04:00
test_maps.c	bpf: testing: fix devmap tests	2017-07-29 14:13:20 -07:00
test_obj_id.c	bpf: Fix test_obj_id.c for llvm 5.0	2017-06-09 15:15:11 -04:00
test_pkt_access.c	selftests/bpf: fix broken build due to types.h	2017-05-17 18:45:14 -04:00
test_pkt_md_access.c	bpf: fix selftest/bpf/test_pkt_md_access on s390x	2017-08-07 10:06:27 -07:00
test_progs.c	bpf: don't zero out the info struct in bpf_obj_get_info_by_fd()	2017-07-26 17:02:52 -07:00
test_tag.c	bpf: Remove bpf_sys.h from selftests	2017-02-10 15:56:08 -05:00
test_tcp_estats.c	selftests/bpf: add a test case to check verifier pointer arithmetic	2017-05-03 09:51:25 -04:00
test_verifier.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-08-09 16:28:45 -07:00
test_xdp.c	selftests: bpf: Use bpf_endian.h in test_xdp.c	2017-05-02 07:52:01 -07:00
test_xdp_redirect.c	selftests: bpf: add a test for XDP redirect	2017-08-08 18:12:50 -07:00
test_xdp_redirect.sh	selftests: bpf: add a test for XDP redirect	2017-08-08 18:12:50 -07:00