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

The dwmac-socfpga.c conflict was a case of a bug fix overlapping
changes in net-next to handle an error pointer differently.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/net/ethernet/emulex/benet/be.h
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
Simple merge

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

diff --cc include/linux/brcmphy.h
Simple merge

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

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

diff --cc net/ipv4/tcp_output.c
index e662d85,d520492..8c8d7e0
--- 1/net/ipv4/tcp_output.c
--- 2/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@@ -2988,12 -2923,14 +2988,14 @@@ struct sk_buff *tcp_make_synack(struct 
  
  #ifdef CONFIG_TCP_MD5SIG
        /* Okay, we have all we need - do the md5 hash if needed */
 -      if (md5) {
 +      if (md5)
                tcp_rsk(req)->af_specific->calc_md5_hash(opts.hash_location,
 -                                             md5, NULL, req, skb);
 -      }
 +                                             md5, req_to_sk(req), skb);
 +      rcu_read_unlock();
  #endif
  
+       /* Do not fool tcpdump (if any), clean our debris */
+       skb->tstamp.tv64 = 0;
        return skb;
  }
  EXPORT_SYMBOL(tcp_make_synack);

diff --cc net/ipv6/ip6_vti.c
Simple merge

diff --cc net/rds/rds.h
Simple merge

diff --cc net/rds/send.c
Simple merge