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	drivers: net: xilinx_emaclite: remove arch limitation	2021-02-16 14:48:59 -08:00
ll_temac_main.c	net: ll_temac: Fix potential NULL dereference in temac_probe()	2020-12-08 16:15:46 -08:00
ll_temac_mdio.c	net: ll_temac: Prepare indirect register access for multicast support	2019-05-23 09:33:57 -07:00
ll_temac.h	net: ll_temac: Add ethtool support for coalesce parameters	2020-02-29 21:30:43 -08:00
Makefile
xilinx_axienet_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-04-09 20:48:35 -07:00
xilinx_axienet_mdio.c	net: axienet: Enable more clocks	2021-03-26 15:17:17 -07:00
xilinx_axienet.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-04-09 20:48:35 -07:00
xilinx_emaclite.c	drivers: net: xilinx_emaclite: remove arch limitation	2021-02-16 14:48:59 -08:00