mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-06-21 15:43:21 +02:00
d755d45bc0
Merge in late fixes in preparation for the net-next PR. Conflicts: net/tls/tls_sw.c406e8a651a("net: skmsg: preserve sg.copy across SG transforms")79511603a6("tls: remove dead sockmap (psock) handling from the SW path") drivers/net/ethernet/microsoft/mana/mana_en.cf8fd56977e("net: mana: guard TX wq object destroy with INVALID_MANA_HANDLE check")d07efe5a6e("net: mana: Use per-queue allocation for tx_qp to reduce allocation size") https://lore.kernel.org/ajAPXu-C_PuTgV-a@sirena.org.uk No adjacent changes. Signed-off-by: Jakub Kicinski <kuba@kernel.org>