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
..
enic	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2024-02-22 15:29:26 -08:00
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00