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

Conflicts:
	arch/s390/net/bpf_jit_comp.c
	drivers/net/ethernet/ti/netcp_ethss.c
	net/bridge/br_multicast.c
	net/ipv4/ip_fragment.c

All four conflicts were cases of simple overlapping
changes.

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/net/bpf_jit_comp.c
Simple merge

diff --cc drivers/net/ethernet/cadence/macb.c
Simple merge

diff --cc drivers/net/ethernet/cadence/macb.h
Simple merge

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

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

diff --cc drivers/net/ethernet/freescale/gianfar.h
Simple merge

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

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

diff --cc drivers/net/ethernet/mellanox/mlx4/main.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
Simple merge

diff --cc drivers/net/ethernet/ti/netcp_core.c
Simple merge

diff --cc drivers/net/ethernet/ti/netcp_ethss.c
Simple merge

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

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

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

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

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

diff --cc net/bridge/br_multicast.c
index fd23858,0b39dcc..0752796
--- 1/net/bridge/br_multicast.c
--- 2/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@@ -1441,6 -1424,31 +1440,32 @@@ br_multicast_leave_group(struct net_bri
        if (!mp)
                goto out;
  
 -                      br_mdb_notify(br->dev, port, group, RTM_DELMDB);
+       if (port && (port->flags & BR_MULTICAST_FAST_LEAVE)) {
+               struct net_bridge_port_group __rcu **pp;
+ 
+               for (pp = &mp->ports;
+                    (p = mlock_dereference(*pp, br)) != NULL;
+                    pp = &p->next) {
+                       if (p->port != port)
+                               continue;
+ 
+                       rcu_assign_pointer(*pp, p->next);
+                       hlist_del_init(&p->mglist);
+                       del_timer(&p->timer);
+                       call_rcu_bh(&p->rcu, br_multicast_free_pg);
++                      br_mdb_notify(br->dev, port, group, RTM_DELMDB,
++                                    p->state);
+ 
+                       if (!mp->ports && !mp->mglist &&
+                           netif_running(br->dev))
+                               mod_timer(&mp->timer, jiffies);
+               }
+               goto out;
+       }
+ 
+       if (timer_pending(&other_query->timer))
+               goto out;
+ 
        if (br->multicast_querier) {
                __br_multicast_send_query(br, port, &mp->addr);
  

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

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

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

diff --cc net/ipv4/ip_fragment.c
index f44bccc,921138f..d96722a
--- 1/net/ipv4/ip_fragment.c
--- 2/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@@ -586,22 -587,35 +586,22 @@@ static int ip_frag_reasm(struct ipq *qp
                head->len -= clone->len;
                clone->csum = 0;
                clone->ip_summed = head->ip_summed;
-               add_frag_mem_limit(&qp->q, clone->truesize);
+               add_frag_mem_limit(qp->q.net, clone->truesize);
        }
  
 +      skb_shinfo(head)->frag_list = head->next;
        skb_push(head, head->data - skb_network_header(head));
  
 -      sum_truesize = head->truesize;
 -      for (fp = head->next; fp;) {
 -              bool headstolen;
 -              int delta;
 -              struct sk_buff *next = fp->next;
 -
 -              sum_truesize += fp->truesize;
 +      for (fp=head->next; fp; fp = fp->next) {
 +              head->data_len += fp->len;
 +              head->len += fp->len;
                if (head->ip_summed != fp->ip_summed)
                        head->ip_summed = CHECKSUM_NONE;
                else if (head->ip_summed == CHECKSUM_COMPLETE)
                        head->csum = csum_add(head->csum, fp->csum);
 -
 -              if (skb_try_coalesce(head, fp, &headstolen, &delta)) {
 -                      kfree_skb_partial(fp, headstolen);
 -              } else {
 -                      if (!skb_shinfo(head)->frag_list)
 -                              skb_shinfo(head)->frag_list = fp;
 -                      head->data_len += fp->len;
 -                      head->len += fp->len;
 -                      head->truesize += fp->truesize;
 -              }
 -              fp = next;
 +              head->truesize += fp->truesize;
        }
-       sub_frag_mem_limit(&qp->q, head->truesize);
 -      sub_frag_mem_limit(qp->q.net, sum_truesize);
++      sub_frag_mem_limit(qp->q.net, head->truesize);
  
        head->next = NULL;
        head->dev = dev;

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

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

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

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

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

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