1. 13 Apr, 2024 13 commits
  2. 12 Apr, 2024 26 commits
  3. 11 Apr, 2024 1 commit
    • Jakub Kicinski's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 94426ed2
      Jakub Kicinski authored
      Cross-merge networking fixes after downstream PR.
      
      Conflicts:
      
      net/unix/garbage.c
        47d8ac01 ("af_unix: Fix garbage collector racing against connect()")
        4090fa37 ("af_unix: Replace garbage collection algorithm.")
      
      Adjacent changes:
      
      drivers/net/ethernet/broadcom/bnxt/bnxt.c
        faa12ca2 ("bnxt_en: Reset PTP tx_avail after possible firmware reset")
        b3d0083c ("bnxt_en: Support RSS contexts in ethtool .{get|set}_rxfh()")
      
      drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
        7ac10c7d ("bnxt_en: Fix possible memory leak in bnxt_rdma_aux_device_init()")
        194fad5b ("bnxt_en: Refactor bnxt_rdma_aux_device_init/uninit functions")
      
      drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
        958f56e4 ("net/mlx5e: Un-expose functions in en.h")
        49e6c938 ("net/mlx5e: RSS, Block XOR hash with over 128 channels")
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      94426ed2