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

Cross-merge networking fixes after downstream PR (net-6.13-rc8).

Conflicts:

drivers/net/ethernet/realtek/r8169_main.c
  1f691a1fc4be ("r8169: remove redundant hwmon support")
  152d00a91396 ("r8169: simplify setting hwmon attribute visibility")
https://lore.kernel.org/20250115122152.760b4e8d@canb.auug.org.au

Adjacent changes:

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  152f4da05aee ("bnxt_en: add support for rx-copybreak ethtool command")
  f0aa6a37a3db ("eth: bnxt: always recalculate features after XDP clearing, fix null-deref")

drivers/net/ethernet/intel/ice/ice_type.h
  50327223a8bb ("ice: add lock to protect low latency interface")
  dc26548d729e ("ice: Fix quad registers read on E825")

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

diff --cc .mailmap
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
index caddb5cbc02464b350d7cc6b85618f321ece7693,b6f844cac80eb8c1f205d8d9a23e072a75ae9e45..748c9b1ea7010577fa57d536ba249854cd2bd896
--- 1/drivers/net/ethernet/broadcom/bnxt/bnxt.c
--- 2/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@@ -16264,9 -16229,8 +16279,9 @@@ static int bnxt_init_one(struct pci_de
        if (bp->max_fltr < BNXT_MAX_FLTR)
                bp->max_fltr = BNXT_MAX_FLTR;
        bnxt_init_l2_fltr_tbl(bp);
-       bnxt_set_rx_skb_mode(bp, false);
+       __bnxt_set_rx_skb_mode(bp, false);
        bnxt_set_tpa_flags(bp);
 +      bnxt_init_ring_params(bp);
        bnxt_set_ring_params(bp);
        bnxt_rdma_aux_device_init(bp);
        rc = bnxt_set_dflt_rings(bp, true);

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/freescale/fec_main.c
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_common.h
Simple merge

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

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

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

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

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

diff --cc drivers/net/ethernet/intel/ice/ice_type.h
index f5eac66d207e90c8ae0da64b6ff7c955f58c8245,4a9ef722635ff4a9c0c8b70ed51abe3c3107dbde..33a1a5934c0d57ac28aa53f70bdb2b33d68dff93
--- 1/drivers/net/ethernet/intel/ice/ice_type.h
--- 2/drivers/net/ethernet/intel/ice/ice_type.h
+++ b/drivers/net/ethernet/intel/ice/ice_type.h
@@@ -851,17 -848,8 +851,16 @@@ struct ice_mbx_data 
  #define ICE_PORTS_PER_QUAD    4
  #define ICE_GET_QUAD_NUM(port) ((port) / ICE_PORTS_PER_QUAD)
  
 +#define ATQBAL_FLAGS_INTR_IN_PROGRESS BIT(0)
 +
 +struct ice_e810_params {
 +      /* The wait queue lock also protects the low latency interface */
 +      wait_queue_head_t atqbal_wq;
 +      unsigned int atqbal_flags;
 +};
 +
  struct ice_eth56g_params {
        u8 num_phys;
-       u8 phy_addr[2];
        bool onestep_ena;
        bool sfd_ena;
        u32 peer_delay;

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

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

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

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

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

diff --cc drivers/net/ethernet/xilinx/xilinx_axienet_main.c
Simple merge

diff --cc drivers/net/pcs/pcs-xpcs.c
Simple merge

diff --cc include/net/page_pool/helpers.h
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc tools/net/ynl/pyynl/ynl_gen_c.py
Simple merge