]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
projects / thirdparty / kernel / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0d0eb18 e576349)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 16 Oct 2025 17:53:13 +0000 (10:53 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 31 Oct 2025 13:46:03 +0000 (06:46 -0700)
commit1a2352ad82b515035efe563f997ef8f5ca4f8080
tree5ab09f8bb295fef3b0ae901438132fbe757e9d95tree
parent0d0eb186421d0886ac466008235f6d9eedaf918ecommit | diff
parente5763491237ffee22d9b554febc2d00669f81deecommit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

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

No conflicts, adjacent changes:

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
  ded9813d17d3 ("net: stmmac: Consider Tx VLAN offload tag length for maxSDU")
  26ab9830beab ("net: stmmac: replace has_xxxx with core_type")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
14 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_common.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_flex_pipe.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c diff1 | diff2 | blob | history
drivers/net/usb/usbnet.c diff1 | diff2 | blob | history
include/net/tcp.h diff1 | diff2 | blob | history
include/net/tls.h diff1 | diff2 | blob | history
net/ipv4/tcp_input.c diff1 | diff2 | blob | history
net/mptcp/protocol.c diff1 | diff2 | blob | history
net/tls/tls_device.c diff1 | diff2 | blob | history
net/wireless/nl80211.c diff1 | diff2 | blob | history
A mirror of Linus' kernel repository