Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 22 Oct 2021 10:41:16 +0000 (11:41 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 22 Oct 2021 10:41:16 +0000 (11:41 +0100)
commitbdfa75ad70e93633e18b1ed2b3866c01aa9bf9d2
tree45115e9c988cbaa49f3766cbe6e6775757cb8c20
parentab98bbee072c7c30c391ae742b209efebb468273
parent64222515138e43da1fcf288f0289ef1020427b87
Merge git://git./linux/kernel/git/netdev/net

Lots of simnple overlapping additions.

With a build fix from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
44 files changed:
Documentation/networking/devlink/ice.rst
Documentation/networking/mctp.rst
MAINTAINERS
drivers/net/ethernet/cavium/thunder/nic_main.c
drivers/net/ethernet/cavium/thunder/nicvf_main.c
drivers/net/ethernet/freescale/enetc/enetc_pf.c
drivers/net/ethernet/hisilicon/hns3/hnae3.h
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
drivers/net/ethernet/intel/e1000e/e1000.h
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/ethernet/intel/ice/ice_common.c
drivers/net/ethernet/intel/ice/ice_devids.h
drivers/net/ethernet/intel/ice/ice_devlink.c
drivers/net/ethernet/intel/ice/ice_flex_pipe.c
drivers/net/ethernet/intel/ice/ice_lib.c
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/intel/ice/ice_sched.c
drivers/net/ethernet/intel/ice/ice_sched.h
drivers/net/ethernet/mellanox/mlx5/core/en/fs.h
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c
drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c
drivers/net/ethernet/mellanox/mlx5/core/lag/mp.h
drivers/net/ethernet/microchip/sparx5/sparx5_main.c
drivers/net/ethernet/mscc/ocelot_vsc7514.c
drivers/net/ethernet/sfc/siena_sriov.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/hamradio/baycom_epp.c
include/linux/mlx5/driver.h
include/net/mctp.h
include/net/tcp.h
net/bridge/netfilter/ebtables.c
net/dsa/dsa2.c
net/ipv4/tcp_ipv4.c
net/ipv6/tcp_ipv6.c
net/netfilter/Kconfig
net/netfilter/ipvs/ip_vs_ctl.c
net/netfilter/nft_chain_filter.c
tools/testing/selftests/net/forwarding/forwarding.config.sample