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
..
.gitignore	tools lib bpf: Change FEATURE-DUMP to FEATURE-DUMP.libbpf	2015-11-05 12:47:51 -03:00
Build	bpf tools: Add bpf.c/h for common bpf operations	2015-08-07 10:16:58 -03:00
Makefile	bpf: install libbpf headers on 'make install'	2017-07-26 13:42:09 -07:00
bpf.c	bpf, s390: fix build for libbpf and selftest suite	2017-08-04 11:18:01 -07:00
bpf.h	bpf: allow to specify log level and reduce it for test_verifier	2017-07-20 15:20:27 -07:00
libbpf.c	tools/lib/bpf: expose bpf_program__set_type()	2017-04-01 12:45:57 -07:00
libbpf.h	tools/lib/bpf: expose bpf_program__set_type()	2017-04-01 12:45:57 -07:00