David S. Miller b2d6cee117 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The bpf syscall and selftests conflicts were trivial overlapping changes. The r8169 change involved moving the added mdelay from 'net' into a different function. A TLS close bug fix overlapped with the splitting of the TLS state into separate TX and RX parts. I just expanded the tests in the bug fix from "ctx->conf == X" into "ctx->tx_conf == X && ctx->rx_conf == X". Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-11 20:53:22 -04:00
..
fault-injection	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
ktest	These commits have either been sitting in my INBOX or have been	2018-04-11 16:42:27 -07:00
nvdimm	tools/testing/nvdimm: enable labels for nfit_test.1 dimms	2018-04-16 08:18:51 -07:00
radix-tree	radix tree: use GFP_ZONEMASK bits of gfp_t for flags	2018-04-11 10:28:39 -07:00
scatterlist	tools/testing/scatterlist: Test new __sg_alloc_table_from_pages	2017-09-07 10:54:40 +01:00
selftests	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-11 20:53:22 -04:00
vsock	VSOCK: add tools/testing/vsock/vsock_diag_test	2017-10-05 18:44:17 -07:00