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
..
Makefile	selftests: Migrate nsim-only MACsec tests to Python	2026-04-09 19:38:41 -07:00
config	selftests: move macsec offload tests from net/rtnetlink to drivers/net/netdvesim	2024-11-11 14:12:21 -08:00
devlink.sh	selftest: netdevsim: Add resource dump and scope filter test	2026-04-08 19:55:39 -07:00
devlink_in_netns.sh	…
devlink_trap.sh	…
ethtool-coalesce.sh	…
ethtool-common.sh	…
ethtool-features.sh	…
ethtool-fec.sh	…
ethtool-pause.sh	…
fib.sh	…
fib_notifications.sh	selftests: net: lib: Add kill_process	2024-11-15 16:39:19 -08:00
hw_stats_l3.sh	…
nexthop.sh	selftests: netdevsim: Xfail nexthop test on slow machines	2025-08-05 16:11:03 -07:00
peer.sh	selftests: netdevsim: add carrier state consistency test	2026-01-06 18:04:01 -08:00
psample.sh	…
settings	…
tc-mq-visibility.sh	selftests: net: Adapt ethtool mq tests to fix in qdisc graft	2025-01-15 09:28:51 +00:00
udp_tunnel_nic.sh	netdevsim: remove udp_ports_sleep	2025-06-18 18:53:51 -07:00