Jakub Kicinski 8859a44ea0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts: MAINTAINERS - keep Chandrasekar drivers/net/ethernet/mellanox/mlx5/core/en_main.c - simple fix + trust the code re-added to param.c in -next is fine include/linux/bpf.h - trivial include/linux/ethtool.h - trivial, fix kdoc while at it include/linux/skmsg.h - move to relevant place in tcp.c, comment re-wrapped net/core/skmsg.c - add the sk = sk // sk = NULL around calls net/tipc/crypto.c - trivial Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-04-09 20:48:35 -07:00
..
asm	tools: Add missing stdio.h include to asm/bug.h header	2019-09-25 09:51:44 -03:00
asm-generic	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 36	2019-05-24 17:27:11 +02:00
linux	tools headers UAPI: Update tools' copy of linux/coresight-pmu.h	2021-03-06 16:54:30 -03:00
nolibc	tools/nolibc: Fix position of -lgcc in the documented example	2021-01-21 10:06:45 -08:00
tools
trace/events
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-04-09 20:48:35 -07:00
vdso	tools headers: Synchronize linux/bits.h with the kernel sources	2020-04-14 11:40:05 -03:00