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

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/faraday/ftgmac100.c
  4186c8d9e6af ("net: ftgmac100: Ensure tx descriptor updates are visible")
  e24a6c874601 ("net: ftgmac100: Get link speed and duplex for NC-SI")
https://lore.kernel.org/0b851ec5-f91d-4dd3-99da-e81b98c9ed28@kernel.org

net/ipv4/tcp.c
  bac76cf89816 ("tcp: fix forever orphan socket caused by tcp_abort")
  edefba66d929 ("tcp: rstreason: introduce SK_RST_REASON_TCP_STATE for active reset")
https://lore.kernel.org/20240828112207.5c199d41@canb.auug.org.au

No adjacent changes.

Link: https://patch.msgid.link/20240829130829.39148-1-pabeni@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/ethernet/faraday/ftgmac100.c
index 444671b,4c546c3..f3cc14c
--- 1/drivers/net/ethernet/faraday/ftgmac100.c
--- 2/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@@ -1554,16 -1553,15 +1564,16 @@@ static int ftgmac100_open(struct net_de
  
        return 0;
  
-  err_ncsi:
+ err_ncsi:
 +      phy_stop(netdev->phydev);
        napi_disable(&priv->napi);
        netif_stop_queue(netdev);
-  err_alloc:
+ err_alloc:
        ftgmac100_free_buffers(priv);
        free_irq(netdev->irq, netdev);
-  err_irq:
+ err_irq:
        netif_napi_del(&priv->napi);
-  err_hw:
+ err_hw:
        iowrite32(0, priv->base + FTGMAC100_OFFSET_IER);
        ftgmac100_free_rings(priv);
        return err;

diff --cc drivers/net/ethernet/ti/icssg/icssg_prueth.c
Simple merge

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

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

diff --cc net/ethtool/ioctl.c
Simple merge

diff --cc net/ipv4/tcp.c
index 8514257,831a18d..8a5680b
--- 1/net/ipv4/tcp.c
--- 2/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@@ -4649,12 -4653,10 +4656,10 @@@ int tcp_abort(struct sock *sk, int err
        local_bh_disable();
        bh_lock_sock(sk);
  
-       if (!sock_flag(sk, SOCK_DEAD)) {
-               if (tcp_need_reset(sk->sk_state))
-                       tcp_send_active_reset(sk, GFP_ATOMIC,
-                                             SK_RST_REASON_TCP_STATE);
-               tcp_done_with_error(sk, err);
-       }
+       if (tcp_need_reset(sk->sk_state))
+               tcp_send_active_reset(sk, GFP_ATOMIC,
 -                                    SK_RST_REASON_NOT_SPECIFIED);
++                                    SK_RST_REASON_TCP_STATE);
+       tcp_done_with_error(sk, err);
  
        bh_unlock_sock(sk);
        local_bh_enable();

diff --cc net/mptcp/protocol.h
Simple merge