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: Fix off-by 1 relative directory includes	2020-03-06 08:36:46 -03:00
asm-generic	fs: add mount_setattr()	2021-01-24 14:42:45 +01:00
drm	tools headers UAPI: Sync drm/i915_drm.h with the kernel sources	2021-03-06 16:54:22 -03:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-04-09 20:48:35 -07:00
sound	tools include UAPI: Sync sound/asound.h copy	2020-02-12 11:04:23 -03:00