David S. Miller fb796707d7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Both conflict were simple overlapping changes. In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the conversion of the driver in net-next to use in-netdev stats. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-04-21 20:23:53 -07:00
..
.gitignore	reuseport, bpf: add test case for bpf_get_numa_node_id	2016-10-22 17:05:52 -04:00
config	selftests: create test-specific kconfig fragments	2016-02-25 09:47:52 -07:00
Makefile	selftests: add a generic testsuite for ethernet device	2017-04-05 08:30:11 -07:00
netdevice.sh	selftests: add a generic testsuite for ethernet device	2017-04-05 08:30:11 -07:00
psock_fanout.c	selftests/net: Fixes psock_fanout CBPF test case	2017-04-20 15:39:19 -04:00
psock_lib.h	selftests/net: Fixes psock_fanout CBPF test case	2017-04-20 15:39:19 -04:00
psock_tpacket.c	tools: psock_tpacket: block Rx until socket filter has been added and socket has been bound to loopback.	2017-01-05 15:03:41 -05:00
reuseport_bpf_cpu.c	soreuseport: BPF selection functional test for TCP	2016-02-11 03:54:15 -05:00
reuseport_bpf_numa.c	reuseport, bpf: add test case for bpf_get_numa_node_id	2016-10-22 17:05:52 -04:00
reuseport_bpf.c	soreuseport: Fix reuseport_bpf testcase on 32bit architectures	2016-06-06 15:20:16 -07:00
reuseport_dualstack.c	soreuseport: test mixed v4/v6 sockets	2016-04-14 21:14:04 -04:00
run_afpackettests	selftests: Introduce minimal shared logic for running tests	2015-03-13 15:13:40 -06:00
run_netsocktests	selftests: do not require bash to run netsocktests testcase	2017-01-05 13:19:53 -07:00
socket.c
test_bpf.sh	selftests/net: move test out of Makefile into a shell script	2014-11-05 08:12:40 -07:00