Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Mon, 24 Oct 2022 20:44:11 +0000 (13:44 -0700)
committerJakub Kicinski <kuba@kernel.org>
Mon, 24 Oct 2022 20:44:11 +0000 (13:44 -0700)
commit96917bb3a377e1ed103fd5c420a95e5fb25ca104
tree59e0ef14e8707efba95d2f795742ba69a03bc8d0
parent86d6f77a3cce1189ab7c31e52e4d47ca58e7a601
parent337a0a0b63f1c30195733eaacf39e4310a592a68
Merge git://git./linux/kernel/git/netdev/net

include/linux/net.h
  a5ef058dc4d9 ("net: introduce and use custom sockopt socket flag")
  e993ffe3da4b ("net: flag sockets supporting msghdr originated zerocopy")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
MAINTAINERS
arch/x86/net/bpf_jit_comp.c
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
drivers/net/ethernet/freescale/fman/mac.c
drivers/net/ethernet/freescale/fman/mac.h
include/linux/net.h
include/net/sock.h
kernel/bpf/memalloc.c
net/core/net_namespace.c
net/ipv4/udp.c