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

Merge in late fixes to prepare for the 6.15 net-next PR.

No conflicts, adjacent changes:

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  919f9f497dbc ("eth: bnxt: fix out-of-range access of vnic_info array")
  fe96d717d38e ("bnxt_en: Extend queue stop/start for TX rings")

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/broadcom/bnxt/bnxt.c
index 08a41e9c25ff185ab0334aa8daad62ad4cb218cb,2cd79b59cf0022986bd9916426c1f457d3fa94be..934ba9425857d652d0e36aba392254aa43d46dbc
--- 1/drivers/net/ethernet/broadcom/bnxt/bnxt.c
--- 2/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@@ -15892,16 -15659,10 +15903,16 @@@ static int bnxt_queue_start(struct net_
        if (bp->flags & BNXT_FLAG_AGG_RINGS)
                bnxt_db_write(bp, &rxr->rx_agg_db, rxr->rx_agg_prod);
  
 -      cpr = &rxr->bnapi->cp_ring;
 -      cpr->sw_stats->rx.rx_resets++;
 +      if (bp->flags & BNXT_FLAG_SHARED_RINGS) {
 +              rc = bnxt_tx_queue_start(bp, idx);
 +              if (rc)
 +                      goto err_reset;
 +      }
 +
 +      napi_enable(&bnapi->napi);
 +      bnxt_db_nq_arm(bp, &cpr->cp_db, cpr->cp_raw_cons);
  
-       for (i = 0; i <= bp->nr_vnics; i++) {
+       for (i = 0; i < bp->nr_vnics; i++) {
                vnic = &bp->vnic_info[i];
  
                rc = bnxt_hwrm_vnic_set_rss_p5(bp, vnic, true);
@@@ -15930,12 -15687,10 +15941,12 @@@ static int bnxt_queue_stop(struct net_d
  {
        struct bnxt *bp = netdev_priv(dev);
        struct bnxt_rx_ring_info *rxr;
 +      struct bnxt_cp_ring_info *cpr;
        struct bnxt_vnic_info *vnic;
 +      struct bnxt_napi *bnapi;
        int i;
  
-       for (i = 0; i <= bp->nr_vnics; i++) {
+       for (i = 0; i < bp->nr_vnics; i++) {
                vnic = &bp->vnic_info[i];
                vnic->mru = 0;
                bnxt_hwrm_vnic_update(bp, vnic,

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

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

diff --cc drivers/net/ethernet/google/gve/gve_rx_dqo.c
Simple merge

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

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

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

diff --cc drivers/net/ethernet/intel/idpf/idpf_lib.c
Simple merge

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

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

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

diff --cc drivers/net/ethernet/wangxun/libwx/wx_lib.c
Simple merge

diff --cc include/linux/avf/virtchnl.h
Simple merge

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

diff --cc net/socket.c
Simple merge