Merge in late fixes to prepare for the 6.12 net-next PR.

No conflicts or adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>