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-02 14:01:55 -07:00
2021-03-30 16:54:50 -07:00
2021-06-03 13:24:23 -07:00
2021-06-02 14:01:55 -07:00
2021-06-07 14:08:30 -07:00
2021-06-07 14:08:30 -07:00
2021-06-02 14:01:55 -07:00
2021-05-27 08:46:19 -04:00
2021-06-03 15:13:56 -07:00