]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
projects / thirdparty / kernel / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a90f6dc 8fdb05d)
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>
Thu, 5 Feb 2026 17:54:08 +0000 (09:54 -0800)
commita182a62ff77f705f7dd3d98cf05cb3d03751a8f0
tree1bb1f12442bdb77d77acf067fed8ad84c16ec011tree
parenta90f6dcefca6d5ad765435b3188a3a440ed193a1commit | diff
parent8fdb05de0e2db89d8f56144c60ab784812e8c3b7commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

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

No adjacent changes, conflicts:

drivers/net/ethernet/spacemit/k1_emac.c
  3125fc1701694 ("net: spacemit: k1-emac: fix jumbo frame support")
  f66086798f91f ("net: spacemit: Remove broken flow control support")
https://lore.kernel.org/aYIysFIE9ooavWia@sirena.org.uk

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
18 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/adi/adin1110.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_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_ptp.c diff1 | diff2 | blob | history
drivers/net/ethernet/spacemit/k1_emac.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c diff1 | diff2 | blob | history
drivers/net/phy/sfp.c diff1 | diff2 | blob | history
drivers/net/usb/r8152.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mld/iface.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mld/mac80211.c diff1 | diff2 | blob | history
drivers/net/wireless/intel/iwlwifi/mvm/d3.c diff1 | diff2 | blob | history
include/linux/skbuff.h diff1 | diff2 | blob | history
net/core/gro.c diff1 | diff2 | blob | history
net/ethtool/common.c diff1 | diff2 | blob | history
net/ipv6/ip6_fib.c diff1 | diff2 | blob | history
net/netfilter/nf_tables_api.c diff1 | diff2 | blob | history
A mirror of Linus' kernel repository