Jakub Kicinski 41e3ddb291 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR. Conflicts: include/trace/events/rpcgss.h 386f4a7379 ("trace: events: cleanup deprecated strncpy uses") a4833e3aba ("SUNRPC: Fix rpcgss_context trace event acceptor field") Adjacent changes: drivers/net/ethernet/intel/ice/ice_tc_lib.c 2cca35f5dd ("ice: Fix checking for unsupported keys on non-tunnel device") 784feaa65d ("ice: Add support for PFCP hardware offload in switchdev") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2024-04-18 13:12:24 -07:00
..
af_unix.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2024-04-18 13:12:24 -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: Try not to hold unix_gc_lock during accept().	2024-04-16 13:50:57 +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