From: David S. Miller <davem@davemloft.net>
Date: Fri, 22 Oct 2021 10:41:16 +0000 (+0100)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.1-rc5~2768^2~126
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bdfa75ad70e93633e18b1ed2b3866c01aa9bf9d2;p=platform%2Fkernel%2Flinux-starfive.git

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>
---

bdfa75ad70e93633e18b1ed2b3866c01aa9bf9d2
diff --cc drivers/net/ethernet/intel/ice/ice_devids.h
index 8d2c39e,ef4392e..61dd2f1
--- a/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 e3d9f3f,da7288b..1fb754b
--- a/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 net/netfilter/ipvs/ip_vs_ctl.c
index cbea5a6,29ec3ef..e62b40b
--- a/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 tools/testing/selftests/net/forwarding/forwarding.config.sample
index 10ce372,e5e2fbe..bf17e48
--- a/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
++