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

Two trivial overlapping changes conflicts in MPLS and mlx5.

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/dra7.dtsi
Simple merge

diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge

diff --cc drivers/isdn/hardware/eicon/message.c
Simple merge

diff --cc drivers/net/ethernet/amd/xgbe/xgbe-drv.c
Simple merge

diff --cc drivers/net/ethernet/atheros/alx/main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmveth.c
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_eth_soc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_ll2.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_ll2.h
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_roce.c
Simple merge

diff --cc drivers/net/phy/marvell.c
Simple merge

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

diff --cc drivers/net/usb/cdc_ether.c
Simple merge

diff --cc drivers/net/usb/r8152.c
Simple merge

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

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

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

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

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

diff --cc kernel/bpf/syscall.c
index 05ad086,19b6129..08a4d28
--- 1/kernel/bpf/syscall.c
--- 2/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@@ -10,9 -10,10 +10,11 @@@
   * General Public License for more details.
   */
  #include <linux/bpf.h>
 +#include <linux/bpf_trace.h>
  #include <linux/syscalls.h>
  #include <linux/slab.h>
+ #include <linux/vmalloc.h>
+ #include <linux/mmzone.h>
  #include <linux/anon_inodes.h>
  #include <linux/file.h>
  #include <linux/license.h>

diff --cc net/batman-adv/fragmentation.c
Simple merge

diff --cc net/bridge/br_netlink.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc net/mpls/af_mpls.c
index 4dc8196,5b77377..64d3bf2
--- 1/net/mpls/af_mpls.c
--- 2/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@@ -94,35 -98,10 +94,35 @@@ bool mpls_pkt_too_big(const struct sk_b
  }
  EXPORT_SYMBOL_GPL(mpls_pkt_too_big);
  
- static u32 mpls_multipath_hash(struct mpls_route *rt,
-                              struct sk_buff *skb, bool bos)
 +void mpls_stats_inc_outucastpkts(struct net_device *dev,
 +                               const struct sk_buff *skb)
 +{
 +      struct mpls_dev *mdev;
 +
 +      if (skb->protocol == htons(ETH_P_MPLS_UC)) {
 +              mdev = mpls_dev_get(dev);
 +              if (mdev)
 +                      MPLS_INC_STATS_LEN(mdev, skb->len,
 +                                         tx_packets,
 +                                         tx_bytes);
 +      } else if (skb->protocol == htons(ETH_P_IP)) {
 +              IP_UPD_PO_STATS(dev_net(dev), IPSTATS_MIB_OUT, skb->len);
 +#if IS_ENABLED(CONFIG_IPV6)
 +      } else if (skb->protocol == htons(ETH_P_IPV6)) {
 +              struct inet6_dev *in6dev = __in6_dev_get(dev);
 +
 +              if (in6dev)
 +                      IP6_UPD_PO_STATS(dev_net(dev), in6dev,
 +                                       IPSTATS_MIB_OUT, skb->len);
 +#endif
 +      }
 +}
 +EXPORT_SYMBOL_GPL(mpls_stats_inc_outucastpkts);
 +
+ static u32 mpls_multipath_hash(struct mpls_route *rt, struct sk_buff *skb)
  {
        struct mpls_entry_decoded dec;
+       unsigned int mpls_hdr_len = 0;
        struct mpls_shim_hdr *hdr;
        bool eli_seen = false;
        int label_index;
@@@ -308,24 -280,27 +310,24 @@@ static int mpls_forward(struct sk_buff 
        hdr = mpls_hdr(skb);
        dec = mpls_entry_decode(hdr);
  
-       /* Pop the label */
-       skb_pull(skb, sizeof(*hdr));
-       skb_reset_network_header(skb);
- 
-       skb_orphan(skb);
- 
        rt = mpls_route_input_rcu(net, dec.label);
 -      if (!rt)
 +      if (!rt) {
 +              MPLS_INC_STATS(mdev, rx_noroute);
                goto drop;
 +      }
  
-       nh = mpls_select_multipath(rt, skb, dec.bos);
+       nh = mpls_select_multipath(rt, skb);
        if (!nh)
 -              goto drop;
 -
 -      /* Find the output device */
 -      out_dev = rcu_dereference(nh->nh_dev);
 -      if (!mpls_output_possible(out_dev))
 -              goto drop;
 +              goto err;
  
+       /* Pop the label */
+       skb_pull(skb, sizeof(*hdr));
+       skb_reset_network_header(skb);
+ 
+       skb_orphan(skb);
+ 
        if (skb_warn_if_lro(skb))
 -              goto drop;
 +              goto err;
  
        skb_forward_csum(skb);
  

diff --cc net/mpls/mpls_iptunnel.c
Simple merge

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

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

diff --cc net/sctp/socket.c
Simple merge

diff --cc net/tipc/node.c
Simple merge