Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Browse source

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>

...

This commit is contained in:

Jakub Kicinski 2021-06-18 19:47:02 -07:00

parent 4bea7207a8 9ed13a17e3

commit adc2e56ebe

858 changed files with 9167 additions and 4041 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

include/linux/ptp_clock_kernel.h

View file