]> www.infradead.org Git - users/hch/misc.git/commitdiff
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)
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:
1  2 
MAINTAINERS
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/phy/phylink.c
drivers/net/vxlan/vxlan_core.c
include/linux/netdevice.h
include/uapi/linux/ethtool.h
net/core/fib_rules.c
net/core/neighbour.c
net/core/rtnetlink.c
net/ethtool/common.c
net/ipv4/arp.c
net/ipv4/devinet.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/arp.c
Simple merge
Simple merge