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

No conflicts.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/adi/adin1110.c
Simple merge

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

diff --cc drivers/net/tun.c
Simple merge

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

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

diff --cc net/ipv4/af_inet.c
Simple merge

diff --cc net/ipv6/udp.c
index 297f7cc,bc65e5b..10f4565
--- 1/net/ipv6/udp.c
--- 2/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@@ -64,8 -64,9 +64,9 @@@ static void udpv6_destruct_sock(struct 
  
  int udpv6_init_sock(struct sock *sk)
  {
 -      skb_queue_head_init(&udp_sk(sk)->reader_queue);
 +      udp_lib_init_sock(sk);
        sk->sk_destruct = udpv6_destruct_sock;
+       set_bit(SOCK_SUPPORT_ZC, &sk->sk_socket->flags);
        return 0;
  }
  

diff --cc net/netfilter/nf_tables_api.c
Simple merge

diff --cc net/netfilter/nft_payload.c
Simple merge

diff --cc net/openvswitch/datapath.c
Simple merge