Jakub Kicinski 35c2c39832 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Merge in late fixes in preparation for the net-next PR. Conflicts: include/net/sch_generic.h a6bd339dbb ("net_sched: fix skb memory leak in deferred qdisc drops") ff2998f29f ("net: sched: introduce qdisc-specific drop reason tracing") https://lore.kernel.org/adz0iX85FHMz0HdO@sirena.org.uk drivers/net/ethernet/airoha/airoha_eth.c 1acdfbdb51 ("net: airoha: Fix VIP configuration for AN7583 SoC") bf3471e6e6 ("net: airoha: Make flow control source port mapping dependent on nbq parameter") Adjacent changes: drivers/net/ethernet/airoha/airoha_ppe.c f44218cd5e ("net: airoha: Reset PPE cpu port configuration in airoha_ppe_hw_init()") 7da62262ec ("inet: add ip_local_port_step_width sysctl to improve port usage distribution") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2026-04-14 12:04:00 -07:00
..
fbnic	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2026-04-14 12:04:00 -07:00
Kconfig	fbnic: Replace use of internal PCS w/ Designware XPCS	2025-11-27 10:41:31 +01:00
Makefile	…