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>
f796feabb9
56667da739
aa82ac51d6
11498715f2