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

Merge in late fixes in preparation for the net-next PR.

Conflicts:

net/tls/tls_sw.c
  406e8a651a7b ("net: skmsg: preserve sg.copy across SG transforms")
  79511603a65b ("tls: remove dead sockmap (psock) handling from the SW path")

drivers/net/ethernet/microsoft/mana/mana_en.c
  f8fd56977eeea ("net: mana: guard TX wq object destroy with INVALID_MANA_HANDLE check")
  d07efe5a6e641 ("net: mana: Use per-queue allocation for tx_qp to reduce allocation size")
https://lore.kernel.org/ajAPXu-C_PuTgV-a@sirena.org.uk

No adjacent changes.

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

diff --cc drivers/net/ethernet/airoha/airoha_eth.c
Simple merge

diff --cc drivers/net/ethernet/airoha/airoha_ppe.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.h
Simple merge

diff --cc drivers/net/ethernet/broadcom/genet/bcmgenet.c
Simple merge

diff --cc drivers/net/ethernet/intel/igc/igc_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/octeontx2/af/mbox.h
Simple merge

diff --cc drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
Simple merge

diff --cc drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
Simple merge

diff --cc drivers/net/ethernet/microsoft/mana/gdma_main.c
Simple merge

diff --cc drivers/net/ethernet/microsoft/mana/mana_en.c
index 26aef21c6c2c89406fd89e5e18ef7f554b4c5961,d7de4c4d25bbe51a37e37fa7dec1af7b6fa48854..87862b0434c76e3ba9e18cfb4f445814ca9eafc3
--- 1/drivers/net/ethernet/microsoft/mana/mana_en.c
--- 2/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@@ -2399,15 -2332,14 +2399,17 @@@ static void mana_destroy_txq(struct man
                        napi_synchronize(napi);
                        napi_disable_locked(napi);
                        netif_napi_del_locked(napi);
 -                      apc->tx_qp[i].txq.napi_initialized = false;
 +                      apc->tx_qp[i]->txq.napi_initialized = false;
                }
-               mana_destroy_wq_obj(apc, GDMA_SQ, apc->tx_qp[i]->tx_object);
 -              if (apc->tx_qp[i].tx_object != INVALID_MANA_HANDLE)
 -                      mana_destroy_wq_obj(apc, GDMA_SQ, apc->tx_qp[i].tx_object);
+ 
 -              mana_deinit_cq(apc, &apc->tx_qp[i].tx_cq);
++              if (apc->tx_qp[i]->tx_object != INVALID_MANA_HANDLE)
++                      mana_destroy_wq_obj(apc, GDMA_SQ, apc->tx_qp[i]->tx_object);
 +
 +              mana_deinit_cq(apc, &apc->tx_qp[i]->tx_cq);
  
 -              mana_deinit_txq(apc, &apc->tx_qp[i].txq);
 +              mana_deinit_txq(apc, &apc->tx_qp[i]->txq);
 +
 +              kvfree(apc->tx_qp[i]);
        }
  
        kfree(apc->tx_qp);

diff --cc drivers/net/pfcp.c
Simple merge

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

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

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

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

diff --cc net/atm/common.c
Simple merge

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

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

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

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

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

diff --cc net/kcm/kcmsock.c
Simple merge

diff --cc net/qrtr/af_qrtr.c
Simple merge

diff --cc net/sched/sch_codel.c
Simple merge

diff --cc net/sched/sch_dualpi2.c
Simple merge

diff --cc net/sched/sch_fq_codel.c
Simple merge

diff --cc net/sched/sch_generic.c
Simple merge

diff --cc net/sched/sch_hfsc.c
Simple merge

diff --cc net/tipc/socket.c
Simple merge

diff --cc tools/testing/selftests/tc-testing/tc-tests/infra/qdiscs.json
Simple merge