]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
projects / thirdparty / kernel / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7227e98 1cac389)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 23 Jan 2026 04:13:25 +0000 (20:13 -0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 30 Jan 2026 01:28:54 +0000 (17:28 -0800)
commita010fe8d869635fd15c1d5768ba6a2f48795fa36
treec6bd6ce8580482b8cac589d77df6c6d7f9696894tree
parent7227e984c36b6a95a23f079d01ec5224a5b0e796commit | diff
parent1cac38910ecb881b09f61f57545a771bbe57ba68commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

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

No adjacent changes, conflicts:

drivers/net/ethernet/spacemit/k1_emac.c
  2c84959167d64 ("net: spacemit: Check for netif_carrier_ok() in emac_stats_update()")
  f66086798f91f ("net: spacemit: Remove broken flow control support")
https://lore.kernel.org/aXjAqZA3iEWD_DGM@sirena.org.uk

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
17 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/bonding/bond_main.c diff1 | diff2 | blob | history
drivers/net/dsa/yt921x.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c diff1 | diff2 | blob | history
drivers/net/ethernet/google/gve/gve_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/google/gve/gve_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_lib.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h diff1 | diff2 | blob | history
drivers/net/ethernet/spacemit/k1_emac.c diff1 | diff2 | blob | history
drivers/net/phy/micrel.c diff1 | diff2 | blob | history
include/net/bonding.h diff1 | diff2 | blob | history
net/ipv4/udp_offload.c diff1 | diff2 | blob | history
net/ipv6/icmp.c diff1 | diff2 | blob | history
net/ipv6/tcpv6_offload.c diff1 | diff2 | blob | history
net/mac80211/mlme.c diff1 | diff2 | blob | history
A mirror of Linus' kernel repository