mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 14:53:58 -04:00
Cross-merge networking fixes after downstream PR (net-7.0-rc2). Conflicts: tools/testing/selftests/drivers/net/hw/rss_ctx.py19c3a2a81d("selftests: drv-net: rss: Generate unique ports for RSS context tests")ce5a0f4612("selftests: drv-net: rss_ctx: test RSS contexts persist after ifdown/up") include/net/inet_connection_sock.h858d2a4f67("tcp: fix potential race in tcp_v6_syn_recv_sock()")fcd3d039fa("tcp: make tcp_v{4,6}_send_check() static") https://lore.kernel.org/aZ8PSFLzBrEU3I89@sirena.org.uk drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c drivers/net/ethernet/mellanox/mlx5/core/en/xsk/pool.c69050f8d6d("treewide: Replace kmalloc with kmalloc_obj for non-scalar types")bf4afc53b7("Convert 'alloc_obj' family to use the new default GFP_KERNEL argument")8a96b9144f("net/mlx5e: Alloc xsk channel param out of mlx5e_open_xsk()") Adjacent changes: net/netfilter/ipvs/ip_vs_ctl.cc59bd9e62e("ipvs: use more counters to avoid service lookups")bf4afc53b7("Convert 'alloc_obj' family to use the new default GFP_KERNEL argument") Signed-off-by: Jakub Kicinski <kuba@kernel.org>