]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 12 Jun 2025 17:08:24 +0000 (10:08 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 29 Aug 2025 18:48:01 +0000 (11:48 -0700)
commitd23ad54de795ec0054f90ecb03b41e8f2c410f3a
tree93ee9c1bfac4b54c567cc613039d4898cac04871
parent29828b81a46a3ae55ebc053fce512219172560ba
parent9c736ace0666efe68efd53fcdfa2c6653c3e0e72
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.17-rc4).

No conflicts.

Adjacent changes:

drivers/net/ethernet/intel/idpf/idpf_txrx.c
  02614eee26fb ("idpf: do not linearize big TSO packets")
  6c4e68480238 ("idpf: remove obsolete stashing code")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
16 files changed:
MAINTAINERS
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/cadence/macb_main.c
drivers/net/ethernet/intel/ice/ice.h
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/intel/idpf/idpf_txrx.c
drivers/net/ethernet/marvell/octeontx2/af/rvu.h
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/meta/fbnic/fbnic_netdev.c
drivers/net/ethernet/meta/fbnic/fbnic_pci.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/phy/mscc/mscc.h
drivers/net/phy/mscc/mscc_main.c
include/linux/skbuff.h
net/core/datagram.c
net/ipv4/route.c