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
..
fault-injection	fault-injection: fix failcmd.sh warning	2012-07-31 18:42:38 -07:00
ktest	Greg Kroah-Hartman reported to me that the ktest of v4.10 locked up in an	2017-03-08 11:06:05 -08:00
nvdimm	tools/testing/nvdimm: fix nfit_test buffer overflow	2017-06-15 14:31:41 -07:00
radix-tree	radix tree test suite: Specify -m32 in LDFLAGS too	2017-03-07 13:18:24 -05:00
selftests	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-08-09 16:28:45 -07:00