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

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  e009b2efb7a8 ("bnxt_en: Remove mis-applied code from bnxt_cfg_ntp_filters()")
  0f2b21477988 ("bnxt_en: Fix compile error without CONFIG_RFS_ACCEL")
https://lore.kernel.org/all/20240105115509.225aa8a2@canb.auug.org.au/

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

diff --cc MAINTAINERS
index 2b916990d7f02a732658ed25726b497fb30d9607,b30a37e2eb6851aff18d40aa869c4eb7cb77c2b8..0897c846770167ffcb05d1609375f6ec22c2f748
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -15441,10 -15434,10 +15450,10 @@@ F:        Documentation/devicetree/bindings/ne
  F:    drivers/bluetooth/btnxpuart.c
  
  NXP C45 TJA11XX PHY DRIVER
- M:    Radu Pirea <radu-nicolae.pirea@oss.nxp.com>
+ M:    Andrei Botila <andrei.botila@oss.nxp.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
 -F:    drivers/net/phy/nxp-c45-tja11xx.c
 +F:    drivers/net/phy/nxp-c45-tja11xx*
  
  NXP FSPI DRIVER
  M:    Han Xu <han.xu@nxp.com>

diff --cc arch/x86/kernel/alternative.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 8f10ab4d4a438c909bd4280426749d84e2beb458,e1f1e646cf48007fcfeffaf25df2ee06a160436e..b70ddd33e9ed607acebb616dc19743290e1a7b08
--- 1/drivers/net/ethernet/broadcom/bnxt/bnxt.c
--- 2/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@@ -14088,18 -13081,30 +14090,16 @@@ static void bnxt_cfg_ntp_filters(struc
                                if (rc)
                                        del = true;
                                else
 -                                      set_bit(BNXT_FLTR_VALID, &fltr->state);
 +                                      set_bit(BNXT_FLTR_VALID, &fltr->base.state);
                        }
  
 -                      if (del) {
 -                              spin_lock_bh(&bp->ntp_fltr_lock);
 -                              hlist_del_rcu(&fltr->hash);
 -                              bp->ntp_fltr_count--;
 -                              spin_unlock_bh(&bp->ntp_fltr_lock);
 -                              synchronize_rcu();
 -                              clear_bit(fltr->sw_id, bp->ntp_fltr_bmap);
 -                              kfree(fltr);
 -                      }
 +                      if (del)
 +                              bnxt_del_ntp_filter(bp, fltr);
                }
        }
-       if (test_and_clear_bit(BNXT_HWRM_PF_UNLOAD_SP_EVENT, &bp->sp_event))
-               netdev_info(bp->dev, "Receive PF driver unload event!\n");
 +#endif
  }
  
 -#else
 -
 -static void bnxt_cfg_ntp_filters(struct bnxt *bp)
 -{
 -}
 -
 -#endif /* CONFIG_RFS_ACCEL */
 -
  static int bnxt_udp_tunnel_set_port(struct net_device *netdev, unsigned int table,
                                    unsigned int entry, struct udp_tunnel_info *ti)
  {

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/i40e/i40e_virtchnl_pf.h
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc drivers/net/ethernet/realtek/r8169_main.c
Simple merge

diff --cc drivers/net/usb/ax88179_178a.c
Simple merge

diff --cc drivers/net/virtio_net.c
index 25cf44ce95dd2e461648afdc6b3d0e0990b23ae9,51b1868d2f220bd4dcce9c3902dd0b898bae64f3..3cb8aa19388415f8f7208f45827514f8c6299f28
--- 1/drivers/net/virtio_net.c
--- 2/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@@ -2435,12 -2402,10 +2448,12 @@@ static int virtnet_rx_resize(struct vir
  
        qindex = rq - vi->rq;
  
 -      if (running)
 +      if (running) {
                napi_disable(&rq->napi);
 +              cancel_work_sync(&rq->dim.work);
 +      }
  
-       err = virtqueue_resize(rq->vq, ring_num, virtnet_rq_free_unused_buf);
+       err = virtqueue_resize(rq->vq, ring_num, virtnet_rq_unmap_free_buf);
        if (err)
                netdev_err(vi->dev, "resize rx fail: rx queue index: %d err: %d\n", qindex, err);
  

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/rx.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/trans.c
Simple merge

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/ptp/ptp_ocp.c
Simple merge

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

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

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

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

diff --cc net/mptcp/subflow.c
Simple merge

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

diff --cc net/smc/smc_diag.c
Simple merge