Jakub Kicinski fecc51559a Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR. Conflicts: net/ipv4/udp.c f796feabb9 ("udp: add local "peek offset enabled" flag") 56667da739 ("net: implement lockless setsockopt(SO_PEEK_OFF)") Adjacent changes: net/unix/garbage.c aa82ac51d6 ("af_unix: Drop oob_skb ref before purging queue in GC.") 11498715f2 ("af_unix: Remove io_uring code for GC.") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2024-02-22 15:29:26 -08:00
..
af_unix.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2024-02-22 15:29:26 -08: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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2024-02-22 15:29:26 -08: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