David S. Miller 13dfb3fa49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Just minor overlapping changes in the conflicts here. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-08-06 18:44:57 -07: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
nvdimm	memremap: provide an optional internal refcount in struct dev_pagemap	2019-07-02 14:32:44 -03: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	2019-08-06 18:44:57 -07:00
vsock	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 441	2019-06-05 17:37:17 +02:00