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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
Simple merge

diff --cc drivers/net/tun.c
index 1e9da697081d10e086a26deb1ab38e62f77436b5,e244f5d7512a6e8f8a2a5b5eb141a2024f80a078..56575f88d1fdbfdd790067a3b4631366990cd59a
--- 1/drivers/net/tun.c
--- 2/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@@ -2467,10 -2452,10 +2471,11 @@@ build
                        goto out;
        }
  
 -      if (!rcu_dereference(tun->steering_prog))
 +      if (!rcu_dereference(tun->steering_prog) && tun->numqueues > 1 &&
 +          !tfile->detached)
                rxhash = __skb_get_hash_symmetric(skb);
  
+       skb_record_rx_queue(skb, tfile->queue_index);
        netif_receive_skb(skb);
  
        stats = get_cpu_ptr(tun->pcpu_stats);

diff --cc net/bridge/br_private.h
Simple merge

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

diff --cc net/core/dev.c
index 5927f6a7c301ed90af21a4b82b443f30f00bb483,066aa902d85c3e3f5ad83244b1506a446bebcb88..f2bfd2eda7b2734d29d30f0e82c1a48c1b5b166a
--- 1/net/core/dev.c
--- 2/net/core/dev.c
+++ b/net/core/dev.c
@@@ -5661,9 -5652,13 +5661,13 @@@ static void napi_reuse_skb(struct napi_
        __skb_pull(skb, skb_headlen(skb));
        /* restore the reserve we had after netdev_alloc_skb_ip_align() */
        skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN - skb_headroom(skb));
 -      skb->vlan_tci = 0;
 +      __vlan_hwaccel_clear_tag(skb);
        skb->dev = napi->dev;
        skb->skb_iif = 0;
+ 
+       /* eth_type_trans() assumes pkt_type is PACKET_HOST */
+       skb->pkt_type = PACKET_HOST;
+ 
        skb->encapsulation = 0;
        skb_shinfo(skb)->gso_type = 0;
        skb->truesize = SKB_TRUESIZE(skb_end_offset(skb));

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

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

diff --cc net/sched/sch_fq.c
Simple merge