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

include/linux/netdevice.h
net/socket.c

  d0efb162 ("net: don't unconditionally copy_from_user a struct ifreq for socket ioctls")

  876f0bf9 ("net: socket: simplify dev_ifconf handling")
  29c49648 ("net: socket: rework compat_ifreq_ioctl()")

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