]> git.ipfire.org Git - thirdparty/linux.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 8 Jan 2026 19:37:07 +0000 (11:37 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 26 Mar 2026 19:09:57 +0000 (12:09 -0700)
commit9ebcf66cd6bcaa6c8275c18b7799507156361218
tree69003659880a536e752966e32eeec3c52e388920
parent45b2b84ac6fde39c427018d6cdf7d44258938faa
parent453a4a5f97f0c95b7df458e6afb98d4ab057d90b
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-7.0-rc6).

No conflicts, or adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
17 files changed:
MAINTAINERS
drivers/net/ethernet/airoha/airoha_ppe.c
drivers/net/ethernet/cadence/macb_main.c
drivers/net/ethernet/microchip/lan743x_main.c
drivers/net/ethernet/microsoft/mana/mana_en.c
drivers/net/team/team_core.c
drivers/net/virtio_net.c
include/net/inet_hashtables.h
net/core/dev.c
net/ipv4/inet_connection_sock.c
net/ipv4/udp.c
net/ipv6/ip6_fib.c
net/netfilter/nf_conntrack_netlink.c
net/netfilter/nfnetlink_log.c
net/netfilter/nft_set_rbtree.c
net/tls/tls_sw.c
tools/testing/selftests/net/fib_tests.sh