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
..
af_unix.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2024-04-11 14:23:47 -07:00
diag.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2024-02-01 15:12:37 -08:00
garbage.c	af_unix: Fix garbage collector racing against connect()	2024-04-11 09:46:15 +02:00
Kconfig	af_unix: Remove CONFIG_UNIX_SCM.	2024-01-31 16:41:16 -08:00
Makefile	af_unix: Remove CONFIG_UNIX_SCM.	2024-01-31 16:41:16 -08:00
sysctl_net_unix.c	networking: Update to register_net_sysctl_sz	2023-08-15 15:26:18 -07:00
unix_bpf.c	bpf: sockmap, fix proto update hook to avoid dup calls	2024-01-03 16:50:06 -08:00