linux/drivers/net/ethernet/netronome/nfp
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
..
abm nfp: Replace nfp_pr_et with ethtool_sprintf 2021-03-17 11:42:30 -07:00
bpf ethernet/netronome/nfp: Fix a use after free in nfp_bpf_ctrl_msg_rx 2021-03-29 17:09:51 -07:00
crypto nfp: silence set but not used warning with IPV6=n 2020-12-09 19:42:03 -08:00
flower Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-04-09 20:48:35 -07:00
nfpcore nfp: Replace zero-length array with flexible-array member 2020-12-04 16:00:20 -08:00
nic treewide: remove dummy Makefiles for single targets 2019-08-21 21:05:21 +09:00
ccm_mbox.c nfp: ccm: increase message limits 2019-07-08 20:21:09 -07:00
ccm.c
ccm.h nfp: tls: implement the stream sync RX resync 2019-12-19 17:46:51 -08:00
devlink_param.c nfp: devlink: set unknown fw_load_policy 2019-09-11 15:10:05 +01:00
Makefile nfp: add devlink param infrastructure 2019-09-10 17:29:27 +01:00
nfp_abi.h
nfp_app_nic.c
nfp_app.c
nfp_app.h drivers: net: ethernet: struct sk_buff is declared duplicately 2021-03-25 17:04:15 -07:00
nfp_asm.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
nfp_asm.h
nfp_devlink.c devlink: move request_firmware out of driver 2020-11-19 21:40:57 -08:00
nfp_hwmon.c
nfp_main.c devlink: move request_firmware out of driver 2020-11-19 21:40:57 -08:00
nfp_main.h devlink: move request_firmware out of driver 2020-11-19 21:40:57 -08:00
nfp_net_common.c net, xdp: Introduce xdp_prepare_buff utility routine 2021-01-08 13:39:24 -08:00
nfp_net_ctrl.c nfp: tls: implement the stream sync RX resync 2019-12-19 17:46:51 -08:00
nfp_net_ctrl.h nfp: tls: implement the stream sync RX resync 2019-12-19 17:46:51 -08:00
nfp_net_debugdump.c netronome: Replace zero-length array with flexible-array member 2020-02-24 15:26:17 -08:00
nfp_net_debugfs.c nfp: no need to check return value of debugfs_create functions 2019-08-10 15:25:48 -07:00
nfp_net_ethtool.c nfp: Replace nfp_pr_et with ethtool_sprintf 2021-03-17 11:42:30 -07:00
nfp_net_main.c nfp: add devlink param infrastructure 2019-09-10 17:29:27 +01:00
nfp_net_repr.c net: partially revert dynamic lockdep key changes 2020-05-04 12:05:56 -07:00
nfp_net_repr.h netronome: Replace zero-length array with flexible-array member 2020-02-24 15:26:17 -08:00
nfp_net_sriov.c
nfp_net_sriov.h
nfp_net.h nfp: convert to new udp_tunnel_nic infra 2020-07-14 17:04:27 -07:00
nfp_netvf_main.c remove ioremap_nocache and devm_ioremap_nocache 2020-01-06 09:45:59 +01:00
nfp_port.c
nfp_port.h nfp: Replace nfp_pr_et with ethtool_sprintf 2021-03-17 11:42:30 -07:00
nfp_shared_buf.c