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-07 14:08:30 -07:00
2021-05-17 15:29:35 -07:00
2021-06-16 00:38:59 -07:00
2020-11-09 17:50:28 -08:00
2020-11-09 17:50:28 -08:00
2021-06-07 14:08:30 -07:00
2021-01-29 20:59:53 -08:00
2021-05-17 15:29:35 -07:00
2020-12-16 11:01:04 -08:00
2020-03-16 18:26:54 -07:00
2021-06-07 14:08:30 -07:00
2021-03-28 17:31:13 -07:00
2020-12-14 16:40:27 -08:00
2021-06-07 14:08:30 -07:00
2020-03-16 18:26:55 -07:00
2021-06-04 14:08:09 -07:00
2021-05-17 15:29:35 -07:00
2021-05-17 15:29:35 -07:00