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-03 15:13:56 -07:00
2020-04-20 12:43:24 -07:00
2020-03-29 22:30:57 -07:00
2021-04-16 11:41:07 -07:00
2021-04-20 16:08:02 -07:00
2020-06-18 20:46:23 -07:00