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
..
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
af_netlink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-02-21 13:39:34 -08:00
af_netlink.h	netlink: Add new socket option to enable strict checking on dumps	2018-10-08 10:39:04 -07:00
diag.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
genetlink.c	net: genetlink: return the error code when attribute parsing fails.	2020-02-22 21:58:33 -08:00