David S. Miller a2d6d7ae59 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... The ungrafting from PRIO bug fixes in net, when merged into net-next, merge cleanly but create a build failure. The resolution used here is from Petr Machata. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-01-09 12:13:43 -08:00
..
fault-injection	docs: fault-injection: convert docs to ReST and rename to *.rst	2019-06-14 14:21:07 -06:00
ktest	ktest: Fix some typos in config-bisect.pl	2019-07-24 15:37:18 -04:00
kunit	kunit/kunit_tool_test: Test '--build_dir' option run	2019-12-23 10:52:41 -07:00
nvdimm	tools/testing/nvdimm: Fix mock support for ioremap	2019-12-11 17:11:10 -08:00
radix-tree	Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2019-07-08 15:45:14 -07:00
scatterlist	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
selftests	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-01-09 12:13:43 -08:00
vsock	vsock_test: add SOCK_STREAM MSG_PEEK test	2019-12-20 21:09:21 -08:00