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
..
af_unix.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-02-27 18:31:39 -08:00
diag.c	net: Add UNIX_DIAG_UID to Netlink UNIX socket diagnostics.	2019-05-22 10:36:35 -07:00
garbage.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 62	2019-05-24 17:36:46 +02:00
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile	net: split out functions related to registering inflight socket files	2019-02-28 08:24:23 -07:00
scm.c	net: split out functions related to registering inflight socket files	2019-02-28 08:24:23 -07:00
scm.h	net: split out functions related to registering inflight socket files	2019-02-28 08:24:23 -07:00
sysctl_net_unix.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00