linux

iv/linux

History

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
  f796feabb9f5 ("udp: add local "peek offset enabled" flag")
  56667da7399e ("net: implement lockless setsockopt(SO_PEEK_OFF)")

Adjacent changes:

net/unix/garbage.c
  aa82ac51d633 ("af_unix: Drop oob_skb ref before purging queue in GC.")
  11498715f266 ("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.