android_kernel_msm-6.1_noth.../tools/lib
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
..
api tools api fs: Cache cgroupfs mount point 2021-02-17 15:09:08 -03:00
bpf Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-06-18 19:47:02 -07:00
lockdep
perf perf jit: Let convert_timestamp() to be backwards-compatible 2021-04-29 10:31:00 -03:00
subcmd
symbol
traceevent
argv_split.c
bitmap.c tools: bitmap: sync function declarations with the kernel 2021-05-06 19:24:11 -07:00
ctype.c
find_bit.c tools: sync lib/find_bit implementation 2021-05-06 19:24:12 -07:00
hweight.c
rbtree.c
str_error_r.c
string.c
vsprintf.c
zalloc.c