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
..
.gitignore	SPDX patches for 5.7-rc1.	2020-04-03 13:12:26 -07:00
Makefile	selftests: mptcp: add packet mark test case	2021-04-16 15:23:10 -07:00
config	selftests: mptcp: add ADD_ADDR timeout test case	2020-11-04 17:45:53 -08:00
diag.sh	selftests: mptcp: launch mptcp_connect with timeout	2021-04-02 14:21:50 -07:00
mptcp_connect.c	selftests: mptcp_connect: add SO_TIMESTAMPNS cmsg support	2021-06-04 14:08:09 -07:00
mptcp_connect.sh	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-06-18 19:47:02 -07:00
mptcp_join.sh	selftests: mptcp: enable checksum in mptcp_join.sh	2021-06-18 11:40:11 -07:00
mptcp_sockopt.sh	selftests: mptcp_connect: add SO_TIMESTAMPNS cmsg support	2021-06-04 14:08:09 -07:00
pm_netlink.sh	selftests: mptcp: avoid calling pm_nl_ctl with bad IDs	2021-03-30 17:42:23 -07:00
pm_nl_ctl.c	selftests: mptcp: add addr argument for del_addr	2021-03-30 17:42:23 -07:00
settings	selftests: increase timeout to 10 min	2021-01-27 16:53:55 -08:00
simult_flows.sh	selftests: mptcp: launch mptcp_connect with timeout	2021-04-02 14:21:50 -07:00