David S. Miller 9f6e055907 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... The mptcp conflict was overlapping additions. The SMC conflict was an additional and removal happening at the same time. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-02-27 18:31:39 -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: run kunit_tool from any directory	2020-02-19 15:58:07 -07:00
nvdimm	remove ioremap_nocache and devm_ioremap_nocache	2020-01-06 09:45:59 +01: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-02-27 18:31:39 -08:00
vsock	tools: testing: vsock: Test when server is bound but not listening	2020-02-16 19:01:49 -08:00