Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

include/linux/net.h
  a5ef058d ("net: introduce and use custom sockopt socket flag")
  e993ffe3

 ("net: flag sockets supporting msghdr originated zerocopy")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>