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
..
Kconfig	ethernet: select CONFIG_CRC32 as needed	2020-12-04 14:42:21 -08:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
macb.h	net: macb: Disable PCS auto-negotiation for SGMII fixed-link mode	2021-03-12 16:44:45 -08:00
macb_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-04-09 20:48:35 -07:00
macb_pci.c	net: macb: move pdata to private header	2020-09-30 14:18:19 -07:00
macb_ptp.c	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00