]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 4079918 348f968)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 13 Feb 2025 20:43:01 +0000 (12:43 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 13 Feb 2025 20:43:30 +0000 (12:43 -0800)
commit7a7e0197133d18cfd9931e7d3a842d0f5730223f
treeb9e558f5cbc5e4bec8c32b37e4168976f52f6cc7tree
parent4079918ae720e842ed7dff65fedeb9980b374995commit | diff
parent348f968b89bfeec0bb53dd82dba58b94d97fbd34commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.14-rc3).

No conflicts or adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
12 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c diff1 | diff2 | blob | history
drivers/net/phy/phylink.c diff1 | diff2 | blob | history
drivers/net/vxlan/vxlan_core.c diff1 | diff2 | blob | history
include/linux/netdevice.h diff1 | diff2 | blob | history
include/uapi/linux/ethtool.h diff1 | diff2 | blob | history
net/core/fib_rules.c diff1 | diff2 | blob | history
net/core/neighbour.c diff1 | diff2 | blob | history
net/core/rtnetlink.c diff1 | diff2 | blob | history
net/ethtool/common.c diff1 | diff2 | blob | history
net/ipv4/arp.c diff1 | diff2 | blob | history
net/ipv4/devinet.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.