Merge git://git.kernel.org/pub/scm/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>

diff --cc Documentation/networking/devlink/ice.rst
Simple merge

diff --cc Documentation/networking/mctp.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/cavium/thunder/nic_main.c
Simple merge

diff --cc drivers/net/ethernet/cavium/thunder/nicvf_main.c
Simple merge

diff --cc drivers/net/ethernet/freescale/enetc/enetc_pf.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hnae3.h
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/e1000.h
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_common.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_devids.h
index 8d2c39ee775bfa7854caceaec41f9abc3f0338ac,ef4392e6e2444871c611affdd389964146ddbdb9..61dd2f18dee8ef2ad649e869414c23b08e0c56d4
--- 1/drivers/net/ethernet/intel/ice/ice_devids.h
--- 2/drivers/net/ethernet/intel/ice/ice_devids.h
+++ b/drivers/net/ethernet/intel/ice/ice_devids.h
@@@ -21,8 -21,10 +21,12 @@@
  #define ICE_DEV_ID_E810C_QSFP         0x1592
  /* Intel(R) Ethernet Controller E810-C for SFP */
  #define ICE_DEV_ID_E810C_SFP          0x1593
 +#define ICE_SUBDEV_ID_E810T           0x000E
 +#define ICE_SUBDEV_ID_E810T2          0x000F
+ /* Intel(R) Ethernet Controller E810-XXV for backplane */
+ #define ICE_DEV_ID_E810_XXV_BACKPLANE 0x1599
+ /* Intel(R) Ethernet Controller E810-XXV for QSFP */
+ #define ICE_DEV_ID_E810_XXV_QSFP      0x159A
  /* Intel(R) Ethernet Controller E810-XXV for SFP */
  #define ICE_DEV_ID_E810_XXV_SFP               0x159B
  /* Intel(R) Ethernet Connection E823-C for backplane */

diff --cc drivers/net/ethernet/intel/ice/ice_devlink.c
index e3d9f3f3a6316bd0786d33c8d9f36072cceaef99,da7288bdc9a3fe37b6c1c8e4430e14dd0cc6bf57..1fb754b1355bb7a921ce416759dce8634552e2c4
--- 1/drivers/net/ethernet/intel/ice/ice_devlink.c
--- 2/drivers/net/ethernet/intel/ice/ice_devlink.c
+++ b/drivers/net/ethernet/intel/ice/ice_devlink.c
@@@ -60,11 -63,13 +60,13 @@@ static void ice_info_fw_api(struct ice_
  {
        struct ice_hw *hw = &pf->hw;
  
-       snprintf(ctx->buf, sizeof(ctx->buf), "%u.%u",
-                hw->api_maj_ver, hw->api_min_ver);
+       snprintf(ctx->buf, sizeof(ctx->buf), "%u.%u.%u", hw->api_maj_ver,
+                hw->api_min_ver, hw->api_patch);
+ 
+       return 0;
  }
  
 -static int ice_info_fw_build(struct ice_pf *pf, struct ice_info_ctx *ctx)
 +static void ice_info_fw_build(struct ice_pf *pf, struct ice_info_ctx *ctx)
  {
        struct ice_hw *hw = &pf->hw;
  

diff --cc drivers/net/ethernet/intel/ice/ice_flex_pipe.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_lib.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_sched.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_sched.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/fs.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/lag/mp.h
Simple merge

diff --cc drivers/net/ethernet/microchip/sparx5/sparx5_main.c
Simple merge

diff --cc drivers/net/ethernet/mscc/ocelot_vsc7514.c
Simple merge

diff --cc drivers/net/ethernet/sfc/siena_sriov.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/hamradio/baycom_epp.c
Simple merge

diff --cc include/linux/mlx5/driver.h
Simple merge

diff --cc include/net/mctp.h
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc net/bridge/netfilter/ebtables.c
Simple merge

diff --cc net/dsa/dsa2.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc net/netfilter/Kconfig
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_ctl.c
index cbea5a68afb5d688089d6d1940197fee3171119e,29ec3ef63edc7a6b59b37bd0eb5e95b25e32bf57..e62b40bd349e22910e19a2241afeb97aa5ef97c7
--- 1/net/netfilter/ipvs/ip_vs_ctl.c
--- 2/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@@ -4096,8 -4090,11 +4096,13 @@@ static int __net_init ip_vs_control_net
        tbl[idx++].data = &ipvs->sysctl_conn_reuse_mode;
        tbl[idx++].data = &ipvs->sysctl_schedule_icmp;
        tbl[idx++].data = &ipvs->sysctl_ignore_tunneled;
 +      ipvs->sysctl_run_estimation = 1;
 +      tbl[idx++].data = &ipvs->sysctl_run_estimation;
+ #ifdef CONFIG_IP_VS_DEBUG
+       /* Global sysctls must be ro in non-init netns */
+       if (!net_eq(net, &init_net))
+               tbl[idx++].mode = 0444;
+ #endif
  
        ipvs->sysctl_hdr = register_net_sysctl(net, "net/ipv4/vs", tbl);
        if (ipvs->sysctl_hdr == NULL) {

diff --cc net/netfilter/nft_chain_filter.c
Simple merge

diff --cc tools/testing/selftests/net/forwarding/forwarding.config.sample
index 10ce3720aa6f28ddbec1631d9a376345c1117c8d,e5e2fbeca22ec6cad75ea0bb2acf2c583fb6a144..bf17e485684f0d3b3f1cba27f3d1d250ce15ee24
--- 1/tools/testing/selftests/net/forwarding/forwarding.config.sample
--- 2/tools/testing/selftests/net/forwarding/forwarding.config.sample
+++ b/tools/testing/selftests/net/forwarding/forwarding.config.sample
@@@ -39,6 -39,5 +39,9 @@@ NETIF_CREATE=ye
  # Timeout (in seconds) before ping exits regardless of how many packets have
  # been sent or received
  PING_TIMEOUT=5
 +# Flag for tc match, supposed to be skip_sw/skip_hw which means do not process
 +# filter by software/hardware
 +TC_FLAG=skip_hw
+ # IPv6 traceroute utility name.
+ TROUTE6=traceroute6
++