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
..
2020-09-18 14:12:43 -07:00
2020-11-17 15:22:06 -04:00
2021-05-31 22:45:05 -07:00
2020-11-17 15:22:06 -04:00
2020-11-17 15:22:06 -04:00
2020-05-20 14:08:06 -07:00
2016-12-26 21:35:39 -05:00
2020-07-24 15:41:54 -07:00
2021-04-29 11:57:23 -07:00
2016-06-18 21:34:09 -07:00
2020-05-28 11:11:44 -07:00
2021-05-31 22:45:05 -07:00
2020-05-28 11:11:45 -07:00
2011-07-01 16:16:19 -07:00
2021-05-21 14:46:59 -07:00
2021-05-21 14:46:59 -07:00
2019-02-04 14:59:11 -08:00