mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 06:44:00 -04:00
Merge in late fixes in preparation for the net-next PR. Conflicts: include/net/sch_generic.ha6bd339dbb("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.c1acdfbdb51("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.cf44218cd5e("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>