Jakub Kicinski 94426ed213 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR. Conflicts: net/unix/garbage.c 47d8ac011f ("af_unix: Fix garbage collector racing against connect()") 4090fa373f ("af_unix: Replace garbage collection algorithm.") Adjacent changes: drivers/net/ethernet/broadcom/bnxt/bnxt.c faa12ca245 ("bnxt_en: Reset PTP tx_avail after possible firmware reset") b3d0083caf ("bnxt_en: Support RSS contexts in ethtool .{get|set}_rxfh()") drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c 7ac10c7d72 ("bnxt_en: Fix possible memory leak in bnxt_rdma_aux_device_init()") 194fad5b27 ("bnxt_en: Refactor bnxt_rdma_aux_device_init/uninit functions") drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c 958f56e483 ("net/mlx5e: Un-expose functions in en.h") 49e6c93870 ("net/mlx5e: RSS, Block XOR hash with over 128 channels") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2024-04-11 14:23:47 -07:00
..
asm	tools headers: Update the copy of x86's mem{cpy,set}_64.S used in 'perf bench'	2023-05-17 10:42:19 -03:00
asm-generic	perf tools headers: update the asm-generic/unaligned.h copy with the kernel sources	2024-01-31 14:02:41 -03:00
io_uring	selftests/net: Extract uring helpers to be reusable	2023-10-19 16:42:03 -06:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2024-04-11 14:23:47 -07:00
nolibc	tools/nolibc: add support for getrlimit/setrlimit	2023-12-11 22:38:35 +01:00
perf	KVM: selftests: aarch64: Update tools copy of arm_pmuv3.h	2023-12-12 09:46:22 +00:00
tools	tools include: add dis-asm-compat.h to handle version differences	2022-08-01 15:29:49 -03:00
trace/events
uapi	bpf: Sync uapi bpf.h to tools directory	2024-03-25 16:36:56 +01:00
vdso	tools headers: Synchronize {linux,vdso}/bits.h with the kernel sources	2023-03-03 22:34:15 -03:00