Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-7.0-rc2).

Conflicts:

tools/testing/selftests/drivers/net/hw/rss_ctx.py
  19c3a2a81d2b ("selftests: drv-net: rss: Generate unique ports for RSS context tests")
  ce5a0f4612db ("selftests: drv-net: rss_ctx: test RSS contexts persist after ifdown/up")

include/net/inet_connection_sock.h
  858d2a4f67ff6 ("tcp: fix potential race in tcp_v6_syn_recv_sock()")
  fcd3d039fab69 ("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.c
  69050f8d6d075 ("treewide: Replace kmalloc with kmalloc_obj for non-scalar types")
  bf4afc53b77ae ("Convert 'alloc_obj' family to use the new default GFP_KERNEL argument")
  8a96b9144f18a ("net/mlx5e: Alloc xsk channel param out of mlx5e_open_xsk()")

Adjacent changes:

net/netfilter/ipvs/ip_vs_ctl.c
  c59bd9e62e06 ("ipvs: use more counters to avoid service lookups")
  bf4afc53b77a ("Convert 'alloc_obj' family to use the new default GFP_KERNEL argument")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/cadence/macb_main.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
Simple merge

diff --cc drivers/net/ethernet/freescale/ucc_geth.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmveth.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/xsk/pool.c
index 565e5c4ddccee2f1ed7ea358e78c28c3570c39ef,c5ba22eed8f19feef19f4a2778b22a7b826f182f..96a259914cbde0874cf258cf8f9a47c382fc35a4
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/pool.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/pool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/pool.c
@@@ -91,13 -88,9 +90,13 @@@ static int mlx5e_xsk_enable_locked(stru
        if (unlikely(!mlx5e_xsk_is_pool_sane(pool)))
                return -EINVAL;
  
-       cparam = kvzalloc_obj(*cparam, GFP_KERNEL);
++      cparam = kvzalloc_obj(*cparam);
 +      if (!cparam)
 +              return -ENOMEM;
 +
        err = mlx5e_xsk_map_pool(mlx5_sd_ch_ix_get_dev(priv->mdev, ix), pool);
        if (unlikely(err))
 -              return err;
 +              goto err_free_cparam;
  
        err = mlx5e_xsk_add_pool(&priv->xsk, pool, ix);
        if (unlikely(err))

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc include/net/inet_connection_sock.h
index bbc9355871c767b51e3d1a4d2436022a8556416c,5cb3056d6ddc7cb9489131f503b32f3dac211bec..433c2df23076d8431353f1a0f1f333bc05b712ae
--- 1/include/net/inet_connection_sock.h
--- 2/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@@ -42,7 -42,10 +42,9 @@@ struct inet_connection_sock_af_ops 
                                      struct request_sock *req,
                                      struct dst_entry *dst,
                                      struct request_sock *req_unhash,
-                                     bool *own_req);
+                                     bool *own_req,
+                                     void (*opt_child_init)(struct sock *newsk,
+                                                            const struct sock *sk));
 -      u16         net_header_len;
        int         (*setsockopt)(struct sock *sk, int level, int optname,
                                  sockptr_t optval, unsigned int optlen);
        int         (*getsockopt)(struct sock *sk, int level, int optname,

diff --cc include/net/sock.h
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc net/mptcp/subflow.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_conn.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_ctl.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_est.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_xmit.c
Simple merge

diff --cc net/netfilter/nf_tables_api.c
Simple merge

diff --cc net/netfilter/nft_compat.c
Simple merge

diff --cc net/netfilter/nft_connlimit.c
Simple merge

diff --cc net/netfilter/nft_ct.c
Simple merge

diff --cc net/netfilter/nft_last.c
Simple merge

diff --cc net/netfilter/nft_limit.c
Simple merge

diff --cc net/netfilter/nft_numgen.c
Simple merge

diff --cc net/netfilter/nft_quota.c
Simple merge

diff --cc net/netfilter/nft_set_rbtree.c
Simple merge

diff --cc net/tls/tls_device_fallback.c
Simple merge

diff --cc tools/testing/selftests/drivers/net/hw/rss_ctx.py
index cbeb3a38fdfeb3c7b117a0cf88a6cb391ebebedc,b9b7527c2c6b9bc849ec5a7af0bb5c42a6ed3775..97246eab863a6ace016a21a1e636f8eaef78c75c
--- 1/tools/testing/selftests/drivers/net/hw/rss_ctx.py
--- 2/tools/testing/selftests/drivers/net/hw/rss_ctx.py
+++ b/tools/testing/selftests/drivers/net/hw/rss_ctx.py
@@@ -4,13 -4,15 +4,16 @@@
  import datetime
  import random
  import re
+ import time
++from lib.py import ksft_disruptive
  from lib.py import ksft_run, ksft_pr, ksft_exit
  from lib.py import ksft_eq, ksft_ne, ksft_ge, ksft_in, ksft_lt, ksft_true, ksft_raises
  from lib.py import NetDrvEpEnv
  from lib.py import EthtoolFamily, NetdevFamily
  from lib.py import KsftSkipEx, KsftFailEx
 -from lib.py import ksft_disruptive
 -from lib.py import rand_port
 -from lib.py import cmd, ethtool, ip, defer, GenerateTraffic, CmdExitFailure, wait_file
 +from lib.py import rand_port, rand_ports
- from lib.py import ethtool, ip, defer, GenerateTraffic, CmdExitFailure
++from lib.py import cmd, ethtool, ip, defer, CmdExitFailure, wait_file
++from lib.py import GenerateTraffic
  
  
  def _rss_key_str(key):