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
..
asm	tools arch: Update arch/x86/lib/mem{cpy,set}_64.S copies used in 'perf bench mem memcpy'	2021-05-10 09:01:00 -03:00
asm-generic	Merge branch 'akpm' (patches from Andrew)	2021-05-07 00:34:51 -07:00
linux	linux/bits.h: fix compilation error with GENMASK	2021-05-22 15:09:07 -10:00
nolibc	tools/nolibc: Fix position of -lgcc in the documented example	2021-01-21 10:06:45 -08:00
tools	tools: bpf: fix license for a compat header file	2018-09-19 23:49:58 +02:00
trace/events	tools/lib/lockdep: Remove private kernel headers	2017-06-05 09:28:14 +02:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-06-18 19:47:02 -07:00
vdso	tools headers: Synchronize linux/bits.h with the kernel sources	2020-04-14 11:40:05 -03:00