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

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/sfc/tc.c
  fa165e194997 ("sfc: don't unregister flow_indr if it was never registered")
  3bf969e88ada ("sfc: add MAE table machinery for conntrack table")
https://lore.kernel.org/all/20230818112159.7430e9b4@canb.auug.org.au/

No adjacent changes.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/chip.c
Simple merge

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

diff --cc drivers/net/ethernet/intel/i40e/i40e_nvm.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_eswitch.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c
Simple merge

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

diff --cc drivers/net/ethernet/sfc/ef100_nic.c
Simple merge

diff --cc drivers/net/ethernet/sfc/tc.c
index 246657222958964df5cf9fba83efdb72b61ee3fc,fe268b6c1cacf5ff1a3689f0fd7e72045d9f5906..039180c61c8301963362554c0b1c04f5ce09ec86
--- 1/drivers/net/ethernet/sfc/tc.c
--- 2/drivers/net/ethernet/sfc/tc.c
+++ b/drivers/net/ethernet/sfc/tc.c
@@@ -2087,17 -1657,11 +2087,17 @@@ int efx_init_tc(struct efx_nic *efx
        rc = efx_tc_configure_fallback_acts_reps(efx);
        if (rc)
                return rc;
 -      rc = flow_indr_dev_register(efx_tc_indr_setup_cb, efx);
 +      rc = efx_mae_get_tables(efx);
        if (rc)
                return rc;
-       efx->tc->up = true;
 +      rc = flow_indr_dev_register(efx_tc_indr_setup_cb, efx);
 +      if (rc)
 +              goto out_free;
+       efx->tc->up = true;
        return 0;
 +out_free:
 +      efx_mae_free_tables(efx);
 +      return rc;
  }
  
  void efx_fini_tc(struct efx_nic *efx)

diff --cc drivers/net/pcs/pcs-rzn1-miic.c
Simple merge

diff --cc drivers/net/phy/phy_device.c
Simple merge

diff --cc drivers/net/team/team.c
Simple merge

diff --cc drivers/net/veth.c
Simple merge

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc drivers/vdpa/mlx5/net/mlx5_vnet.c
Simple merge

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

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

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

diff --cc net/key/af_key.c
Simple merge

diff --cc net/openvswitch/datapath.c
Simple merge

diff --cc net/sunrpc/svcsock.c
Simple merge