mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-01-07 21:14:10 -05:00
Cross-merge networking fixes after downstream PR. Conflicts: net/sched/act_ct.c26488172b0("net/sched: Fix UAF when resolving a clash")3abbd7ed8b("act_ct: prepare for stolen verdict coming from conntrack and nat engine") No adjacent changes. Signed-off-by: Jakub Kicinski <kuba@kernel.org>