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
..
2021-06-10 17:37:00 -07:00
2021-06-08 10:25:20 -07:00
2021-05-03 12:58:31 -07:00
2021-05-17 14:39:56 +02:00
2021-05-03 11:19:54 -07:00
2021-05-21 06:06:19 -10:00
2021-06-06 12:39:36 -07:00
\n
2021-05-20 06:20:15 -10:00
2021-06-18 13:54:11 -07:00