Jakub Kicinski adc2e56ebe Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Trivial conflicts in net/can/isotp.c and tools/testing/selftests/net/mptcp/mptcp_connect.sh scaled_ppm_to_ppb() was moved from drivers/ptp/ptp_clock.c to include/linux/ptp_clock_kernel.h in -next so re-apply the fix there. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-06-18 19:47:02 -07:00
..
af_unix.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-06-18 19:47:02 -07: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: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile	net: split out functions related to registering inflight socket files	2019-02-28 08:24:23 -07:00
scm.c	io_uring: move io_uring_get_socket() into io_uring.h	2020-09-30 20:32:33 -06: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