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

Two easily resolvable overlapping change conflicts, one in
TCP and one in the eBPF verifier.

Signed-off-by: David S. Miller <davem@davemloft.net>

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

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum.c
Simple merge

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

diff --cc drivers/net/phy/xilinx_gmii2rgmii.c
Simple merge

diff --cc drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
index f66e1b2,a5ea3ba..3987ada
--- 1/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
--- 2/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
@@@ -155,27 -155,17 +155,17 @@@ static const struct ieee80211_ops mt76x
        .sta_rate_tbl_update = mt76x02_sta_rate_tbl_update,
        .set_rts_threshold = mt76x02_set_rts_threshold,
        .wake_tx_queue = mt76_wake_tx_queue,
 -      .get_txpower = mt76x02_get_txpower,
 +      .get_txpower = mt76_get_txpower,
  };
  
- static int mt76x0u_register_device(struct mt76x02_dev *dev)
+ static int mt76x0u_init_hardware(struct mt76x02_dev *dev)
  {
-       struct ieee80211_hw *hw = dev->mt76.hw;
        int err;
  
-       err = mt76u_alloc_queues(&dev->mt76);
-       if (err < 0)
-               goto out_err;
- 
-       err = mt76u_mcu_init_rx(&dev->mt76);
-       if (err < 0)
-               goto out_err;
- 
        mt76x0_chip_onoff(dev, true, true);
-       if (!mt76x02_wait_for_mac(&dev->mt76)) {
-               err = -ETIMEDOUT;
-               goto out_err;
-       }
+ 
+       if (!mt76x02_wait_for_mac(&dev->mt76))
+               return -ETIMEDOUT;
  
        err = mt76x0u_mcu_init(dev);
        if (err < 0)

diff --cc include/linux/skbuff.h
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/filter.c
Simple merge

diff --cc net/ipv4/tcp.c
index cab6b2f,cf3c509..769508c
--- 1/net/ipv4/tcp.c
--- 2/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@@ -2595,11 -2577,9 +2596,12 @@@ int tcp_disconnect(struct sock *sk, in
        tp->write_seq += tp->max_window + 2;
        if (tp->write_seq == 0)
                tp->write_seq = 1;
 +      icsk->icsk_backoff = 0;
+       tp->snd_cwnd = 2;
        icsk->icsk_probes_out = 0;
 +      icsk->icsk_rto = TCP_TIMEOUT_INIT;
        tp->snd_ssthresh = TCP_INFINITE_SSTHRESH;
 +      tp->snd_cwnd = TCP_INIT_CWND;
        tp->snd_cwnd_cnt = 0;
        tp->window_clamp = 0;
        tp->delivered_ce = 0;

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

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

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/mesh.h
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_ctl.c
Simple merge

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

diff --cc net/xdp/xdp_umem.c
Simple merge

diff --cc net/xdp/xsk.c
Simple merge