]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 5 Dec 2024 19:48:58 +0000 (11:48 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 12 Dec 2024 22:19:05 +0000 (14:19 -0800)
Cross-merge networking fixes after downstream PR (net-6.13-rc3).

No conflicts or adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1  2 
Documentation/networking/ip-sysctl.rst
MAINTAINERS
Makefile
drivers/net/dsa/microchip/ksz_common.c
drivers/net/ethernet/renesas/rswitch.c
drivers/net/ethernet/renesas/rswitch.h
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
kernel/bpf/devmap.c
net/core/rtnetlink.c

diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
Simple merge
Simple merge