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/ethernet/intel/i40e/i40e_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
Simple merge

diff --cc drivers/net/ethernet/intel/iavf/iavf_main.c
index 95772e17e5bef354aa33a48106aa6433903a81a4,f3ecb3bca33dde77895c7742861940c9675e9249..541103909ef4a85551c6f532763539bc7ae18e22
--- 1/drivers/net/ethernet/intel/iavf/iavf_main.c
--- 2/drivers/net/ethernet/intel/iavf/iavf_main.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c
@@@ -983,9 -983,8 +983,9 @@@ struct iavf_mac_filter *iavf_add_filter
  
                list_add_tail(&f->list, &adapter->mac_filter_list);
                f->add = true;
 +              f->add_handled = false;
                f->is_new_mac = true;
-               f->is_primary = false;
+               f->is_primary = ether_addr_equal(macaddr, adapter->hw.mac.addr);
                adapter->aq_required |= IAVF_FLAG_AQ_ADD_MAC_FILTER;
        } else {
                f->remove = false;

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

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

diff --cc net/ax25/af_ax25.c
Simple merge

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