From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 11 Feb 2022 01:29:56 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.1-rc5~1746^2~380
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b91c5cc0e7be4e41567cb2a6e21a8bb682c7cc5;p=platform%2Fkernel%2Flinux-starfive.git

Merge git://git./linux/kernel/git/netdev/net

No conflicts.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

5b91c5cc0e7be4e41567cb2a6e21a8bb682c7cc5
diff --cc drivers/net/ethernet/intel/ice/ice.h
index 6a710c2,a9fa701..827fcb5
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@@ -485,8 -482,8 +485,9 @@@ enum ice_pf_flags 
  	ICE_FLAG_LEGACY_RX,
  	ICE_FLAG_VF_TRUE_PROMISC_ENA,
  	ICE_FLAG_MDD_AUTO_RESET_VF,
 +	ICE_FLAG_VF_VLAN_PRUNING,
  	ICE_FLAG_LINK_LENIENT_MODE_ENA,
+ 	ICE_FLAG_PLUG_AUX_DEV,
  	ICE_PF_FLAGS_NBITS		/* must be last */
  };
  
diff --cc tools/testing/selftests/net/mptcp/mptcp_join.sh
index 4a565fb,c0801df..18bb0d0
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@@ -1288,17 -1148,18 +1288,18 @@@ signal_address_tests(
  
  	# signal addresses race test
  	reset
 -	ip netns exec $ns1 ./pm_nl_ctl limits 4 4
 -	ip netns exec $ns2 ./pm_nl_ctl limits 4 4
 -	ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.1 flags signal
 -	ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal
 -	ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal
 -	ip netns exec $ns1 ./pm_nl_ctl add 10.0.4.1 flags signal
 -	ip netns exec $ns2 ./pm_nl_ctl add 10.0.1.2 flags signal
 -	ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags signal
 -	ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags signal
 -	ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags signal
 +	pm_nl_set_limits $ns1 4 4
 +	pm_nl_set_limits $ns2 4 4
 +	pm_nl_add_endpoint $ns1 10.0.1.1 flags signal
 +	pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
 +	pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
 +	pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
 +	pm_nl_add_endpoint $ns2 10.0.1.2 flags signal
 +	pm_nl_add_endpoint $ns2 10.0.2.2 flags signal
 +	pm_nl_add_endpoint $ns2 10.0.3.2 flags signal
 +	pm_nl_add_endpoint $ns2 10.0.4.2 flags signal
  	run_tests $ns1 $ns2 10.0.1.1
+ 	chk_join_nr "signal addresses race test" 3 3 3
  
  	# the server will not signal the address terminating
  	# the MPC subflow