Merge git://git.kernel.org/pub/scm/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>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/net/bpf_jit_comp.c
Simple merge

diff --cc drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fman/mac.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fman/mac.h
index 5bf03e1e279ad8ca581477fe780f2f9da7b70e01,13b69ca5f00c292f9cedf125291ba3eba87f53d2..ad06f8d7924be273f0d4fdaaf2371d2814b17f0a
--- 1/drivers/net/ethernet/freescale/fman/mac.h
--- 2/drivers/net/ethernet/freescale/fman/mac.h
+++ b/drivers/net/ethernet/freescale/fman/mac.h
@@@ -21,14 -20,21 +21,14 @@@ struct mac_priv_s
  
  struct mac_device {
        void __iomem            *vaddr;
-       void __iomem            *vaddr_end;
        struct device           *dev;
+       struct resource         *res;
        u8                       addr[ETH_ALEN];
        struct fman_port        *port[2];
 -      u32                      if_support;
 -      struct phy_device       *phy_dev;
 +      struct phylink          *phylink;
 +      struct phylink_config   phylink_config;
        phy_interface_t         phy_if;
 -      struct device_node      *phy_node;
 -      struct net_device       *net_dev;
  
 -      bool autoneg_pause;
 -      bool rx_pause_req;
 -      bool tx_pause_req;
 -      bool rx_pause_active;
 -      bool tx_pause_active;
        bool promisc;
        bool allmulti;
  

diff --cc include/linux/net.h
index 59350fd858231b06fb0a8528fac507cd04ce0e7a,18d942bbdf6e0977f4efe20e0ce17e4092910bd0..b73ad8e3c21286f9d20cd7e4782ef708629a7c87
--- 1/include/linux/net.h
--- 2/include/linux/net.h
+++ b/include/linux/net.h
@@@ -41,7 -41,7 +41,8 @@@ struct net
  #define SOCK_NOSPACE          2
  #define SOCK_PASSCRED         3
  #define SOCK_PASSSEC          4
- #define SOCK_CUSTOM_SOCKOPT   5
+ #define SOCK_SUPPORT_ZC               5
++#define SOCK_CUSTOM_SOCKOPT   6
  
  #ifndef ARCH_HAS_SOCKET_TYPES
  /**

diff --cc include/net/sock.h
Simple merge

diff --cc kernel/bpf/memalloc.c
Simple merge

diff --cc net/core/net_namespace.c
Simple merge

diff --cc net/ipv4/udp.c
index e77c8f0e90878c5eac6226cfbcda4ee91f53bd7e,6a320a614e5473f3e1c321b4974ea736ddb970e3..89accc3c8bb3462722d77b4e559198b97b67c784
--- 1/net/ipv4/udp.c
--- 2/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@@ -1622,8 -1622,9 +1622,9 @@@ static void udp_destruct_sock(struct so
  
  int udp_init_sock(struct sock *sk)
  {
 -      skb_queue_head_init(&udp_sk(sk)->reader_queue);
 +      udp_lib_init_sock(sk);
        sk->sk_destruct = udp_destruct_sock;
+       set_bit(SOCK_SUPPORT_ZC, &sk->sk_socket->flags);
        return 0;
  }