]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 30 Apr 2026 19:49:56 +0000 (12:49 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 14 May 2026 17:08:06 +0000 (10:08 -0700)
Cross-merge networking fixes after downstream PR (net-7.1-rc4).

No conflicts, or adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1  2 
MAINTAINERS
drivers/net/ethernet/cirrus/cs89x0.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/intel/i40e/i40e_ptp.c
drivers/net/ethernet/intel/ice/ice_dpll.c
net/core/dev.c
net/ipv4/tcp_ao.c
net/sched/sch_cbs.c
net/sched/sch_dualpi2.c

diff --cc MAINTAINERS
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge
Simple merge