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

Cross-merge networking fixes after downstream PR.

Conflicts:

net/unix/garbage.c
  47d8ac011fe1 ("af_unix: Fix garbage collector racing against connect()")
  4090fa373f0e ("af_unix: Replace garbage collection algorithm.")

Adjacent changes:

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  faa12ca24558 ("bnxt_en: Reset PTP tx_avail after possible firmware reset")
  b3d0083caf9a ("bnxt_en: Support RSS contexts in ethtool .{get|set}_rxfh()")

drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
  7ac10c7d728d ("bnxt_en: Fix possible memory leak in bnxt_rdma_aux_device_init()")
  194fad5b2781 ("bnxt_en: Refactor bnxt_rdma_aux_device_init/uninit functions")

drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
  958f56e48385 ("net/mlx5e: Un-expose functions in en.h")
  49e6c9387051 ("net/mlx5e: RSS, Block XOR hash with over 128 channels")

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
index d728df139c9c7e61b686c84eb1eea9d03086f8b7,57e61f9631678edf31a2ff237fe0301254a396e5..a30df865be7b39d8d293c4099f2270e31ad4e64e
--- 1/drivers/net/ethernet/broadcom/bnxt/bnxt.c
--- 2/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@@ -11991,10 -11758,10 +11991,12 @@@ static int __bnxt_open_nic(struct bnxt 
        /* VF-reps may need to be re-opened after the PF is re-opened */
        if (BNXT_PF(bp))
                bnxt_vf_reps_open(bp);
+       if (bp->ptp_cfg)
+               atomic_set(&bp->ptp_cfg->tx_avail, BNXT_MAX_TX_TS);
        bnxt_ptp_init_rtc(bp, true);
        bnxt_ptp_cfg_tstamp_filters(bp);
 +      if (BNXT_SUPPORTS_MULTI_RSS_CTX(bp))
 +              bnxt_hwrm_realloc_rss_ctx_vnic(bp);
        bnxt_cfg_usr_fltrs(bp);
        return 0;
  

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
index edb10aebd09586f00a965df73b0338a10fccb2d4,195c02dc0683054e03680abff45f3f42d9605192..d8927838f1cfb4a968e6e70f2a3f0f10de27efe4
--- 1/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
--- 2/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
@@@ -462,10 -402,15 +467,9 @@@ void bnxt_rdma_aux_device_init(struct b
                goto aux_dev_uninit;
  
        edev->ulp_tbl = ulp;
-       aux_priv->edev = edev;
        bp->edev = edev;
        bnxt_set_edev_info(edev, bp);
 -
 -      rc = auxiliary_device_add(aux_dev);
 -      if (rc) {
 -              netdev_warn(bp->dev,
 -                          "Failed to add auxiliary device for ROCE\n");
 -              goto aux_dev_uninit;
 -      }
 +      bp->ulp_num_msix_want = bnxt_set_dflt_ulp_msix(bp);
  
        return;
  

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

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

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

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

diff --cc drivers/net/ethernet/realtek/r8169_main.c
Simple merge

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

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

diff --cc net/batman-adv/translation-table.c
Simple merge

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

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

diff --cc net/unix/af_unix.c
Simple merge

diff --cc tools/include/linux/mm.h
Simple merge