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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/cavium/thunder/thunder_bgx.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns/hns_enet.c
Simple merge

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

diff --cc drivers/net/xen-netfront.c
Simple merge

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

diff --cc include/net/lwtunnel.h
index 45399ed,0388b9c..ebfe237
--- 1/include/net/lwtunnel.h
--- 2/include/net/lwtunnel.h
+++ b/include/net/lwtunnel.h
@@@ -178,10 -178,13 +178,13 @@@ static inline int lwtunnel_valid_encap_
  }
  static inline int lwtunnel_valid_encap_type_attr(struct nlattr *attr, int len)
  {
-       return -EOPNOTSUPP;
+       /* return 0 since we are not walking attr looking for
+        * RTA_ENCAP_TYPE attribute on nexthops.
+        */
+       return 0;
  }
  
 -static inline int lwtunnel_build_state(struct net_device *dev, u16 encap_type,
 +static inline int lwtunnel_build_state(u16 encap_type,
                                       struct nlattr *encap,
                                       unsigned int family, const void *cfg,
                                       struct lwtunnel_state **lws)

diff --cc net/dsa/dsa2.c
Simple merge

diff --cc net/ethernet/eth.c
Simple merge

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

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

diff --cc net/l2tp/l2tp_ip.c
Simple merge

diff --cc net/l2tp/l2tp_ip6.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge