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

Conflicts:
	drivers/net/ethernet/amd/xgbe/xgbe-desc.c
	drivers/net/ethernet/renesas/sh_eth.c

Overlapping changes in both conflict cases.

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

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

diff --cc drivers/net/bonding/bond_netlink.c
Simple merge

diff --cc drivers/net/ethernet/amd/xgbe/xgbe-desc.c
index 51b68d1,b15551b..a50891f
--- 1/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
--- 2/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
@@@ -450,30 -354,8 +450,29 @@@ static void xgbe_unmap_rdata(struct xgb
                rdata->skb = NULL;
        }
  
 -      rdata->tso_header = 0;
 -      rdata->len = 0;
 +      if (rdata->rx.hdr.pa.pages)
 +              put_page(rdata->rx.hdr.pa.pages);
 +
 +      if (rdata->rx.hdr.pa_unmap.pages) {
 +              dma_unmap_page(pdata->dev, rdata->rx.hdr.pa_unmap.pages_dma,
 +                             rdata->rx.hdr.pa_unmap.pages_len,
 +                             DMA_FROM_DEVICE);
 +              put_page(rdata->rx.hdr.pa_unmap.pages);
 +      }
 +
 +      if (rdata->rx.buf.pa.pages)
 +              put_page(rdata->rx.buf.pa.pages);
 +
 +      if (rdata->rx.buf.pa_unmap.pages) {
 +              dma_unmap_page(pdata->dev, rdata->rx.buf.pa_unmap.pages_dma,
 +                             rdata->rx.buf.pa_unmap.pages_len,
 +                             DMA_FROM_DEVICE);
 +              put_page(rdata->rx.buf.pa_unmap.pages);
 +      }
 +
 +      memset(&rdata->tx, 0, sizeof(rdata->tx));
 +      memset(&rdata->rx, 0, sizeof(rdata->rx));
 +
-       rdata->interrupt = 0;
        rdata->mapped_as_page = 0;
  
        if (rdata->state_saved) {

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

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

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

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

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

diff --cc drivers/net/ethernet/marvell/mvneta.c
Simple merge

diff --cc drivers/net/ethernet/marvell/pxa168_eth.c
Simple merge

diff --cc drivers/net/ethernet/marvell/sky2.c
Simple merge

diff --cc drivers/net/ethernet/renesas/sh_eth.c
index ad2e285,b5db6b3..c29ba80
--- 1/drivers/net/ethernet/renesas/sh_eth.c
--- 2/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@@ -1142,11 -1132,13 +1133,13 @@@ static void sh_eth_ring_format(struct n
  
                /* RX descriptor */
                rxdesc = &mdp->rx_ring[i];
 -              rxdesc->addr = virt_to_phys(PTR_ALIGN(skb->data, 4));
+               /* The size of the buffer is a multiple of 16 bytes. */
+               rxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 16);
+               dma_map_single(&ndev->dev, skb->data, rxdesc->buffer_length,
+                              DMA_FROM_DEVICE);
 +              rxdesc->addr = virt_to_phys(skb->data);
                rxdesc->status = cpu_to_edmac(mdp, RD_RACT | RD_RFP);
  
-               /* The size of the buffer is 16 byte boundary. */
-               rxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 16);
                /* Rx descriptor address set */
                if (i == 0) {
                        sh_eth_write(ndev, mdp->rx_desc_dma, RDLAR);
@@@ -1399,9 -1390,8 +1392,10 @@@ static int sh_eth_rx(struct net_device 
        struct sk_buff *skb;
        u16 pkt_len = 0;
        u32 desc_status;
+       int skbuff_size = mdp->rx_buf_sz + SH_ETH_RX_ALIGN - 1;
  
 +      boguscnt = min(boguscnt, *quota);
 +      limit = boguscnt;
        rxdesc = &mdp->rx_ring[entry];
        while (!(rxdesc->status & cpu_to_edmac(mdp, RD_RACT))) {
                desc_status = edmac_to_cpu(mdp, rxdesc->status);
@@@ -1471,12 -1466,12 +1465,12 @@@
                        mdp->rx_skbuff[entry] = skb;
                        if (skb == NULL)
                                break;  /* Better luck next round. */
-                       dma_map_single(&ndev->dev, skb->data, mdp->rx_buf_sz,
-                                      DMA_FROM_DEVICE);
                        sh_eth_set_receive_align(skb);
+                       dma_map_single(&ndev->dev, skb->data,
+                                      rxdesc->buffer_length, DMA_FROM_DEVICE);
  
                        skb_checksum_none_assert(skb);
 -                      rxdesc->addr = virt_to_phys(PTR_ALIGN(skb->data, 4));
 +                      rxdesc->addr = virt_to_phys(skb->data);
                }
                if (entry >= mdp->num_rx_ring - 1)
                        rxdesc->status |=

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

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

diff --cc include/uapi/linux/Kbuild
Simple merge

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

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

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

diff --cc net/openvswitch/flow_netlink.c
Simple merge

diff --cc net/sched/Kconfig
Simple merge