Skip to content
Commit 94426ed2 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files


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>
parents a55b39e8 2ae9a897
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment