Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

No conflicts.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/bcm_sf2.c
Simple merge

diff --cc drivers/net/dsa/mt7530.c
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/chip.c
Simple merge

diff --cc drivers/net/dsa/qca/ar9331.c
Simple merge

diff --cc drivers/net/ethernet/cadence/macb_main.c
Simple merge

diff --cc drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice.h
index 6a710c2,a9fa701..827fcb5
--- 1/drivers/net/ethernet/intel/ice/ice.h
--- 2/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 drivers/net/ethernet/intel/ice/ice_common.c
Simple merge

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

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

diff --cc drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Simple merge

diff --cc drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
Simple merge

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

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

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

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

diff --cc net/mptcp/pm_netlink.c
Simple merge

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

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

diff --cc tools/testing/selftests/net/mptcp/mptcp_join.sh
index 4a565fb,c0801df..18bb0d0
--- 1/tools/testing/selftests/net/mptcp/mptcp_join.sh
--- 2/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