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

Conflicts:
	drivers/net/ethernet/sfc/rx.c

Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change
the rx_buf->is_page boolean into a set of u16 flags, and another to
adjust how ->ip_summed is initialized.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/can/sja1000/sja1000.c
index ebbcfcafe29b7c177a01f59651c6a7803bef42e8,192b0d118df46d4136c5bd5bab872f35d51bcbc7..5e10472371eda2db2764e5976b55e58d9f70f044
--- 1/drivers/net/can/sja1000/sja1000.c
--- 2/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@@ -492,9 -498,12 +497,12 @@@ irqreturn_t sja1000_interrupt(int irq, 
        while ((isrc = priv->read_reg(priv, REG_IR)) && (n < SJA1000_MAX_IRQ)) {
                n++;
                status = priv->read_reg(priv, REG_SR);
+               /* check for absent controller due to hw unplug */
+               if (status == 0xFF && sja1000_is_absent(priv))
+                       return IRQ_NONE;
  
                if (isrc & IRQ_WUI)
 -                      dev_warn(dev->dev.parent, "wakeup interrupt\n");
 +                      netdev_warn(dev, "wakeup interrupt\n");
  
                if (isrc & IRQ_TI) {
                        /* transmission complete interrupt */

diff --cc drivers/net/ethernet/atheros/atl1c/atl1c_main.c
Simple merge

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

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

diff --cc drivers/net/ethernet/cisco/enic/enic_pp.c
Simple merge

diff --cc drivers/net/ethernet/jme.c
Simple merge

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

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

diff --cc drivers/net/ethernet/micrel/ks8851_mll.c
Simple merge

diff --cc drivers/net/ethernet/sfc/rx.c
index 506d246699569138cd6a7bc38692e3ecdfbb9419,fc52fca7419338676a8810a6dd97d8b0c137a39a..1ba290d0c21cd1606e21a2965a86071ca0b595c6
--- 1/drivers/net/ethernet/sfc/rx.c
--- 2/drivers/net/ethernet/sfc/rx.c
+++ b/drivers/net/ethernet/sfc/rx.c
@@@ -155,11 -156,10 +155,10 @@@ static int efx_init_rx_buffers_skb(stru
                if (unlikely(!skb))
                        return -ENOMEM;
  
-               /* Adjust the SKB for padding and checksum */
+               /* Adjust the SKB for padding */
                skb_reserve(skb, NET_IP_ALIGN);
                rx_buf->len = skb_len - NET_IP_ALIGN;
 -              rx_buf->is_page = false;
 +              rx_buf->flags = 0;
-               skb->ip_summed = CHECKSUM_UNNECESSARY;
  
                rx_buf->dma_addr = pci_map_single(efx->pci_dev,
                                                  skb->data, rx_buf->len,
@@@ -494,8 -493,9 +493,9 @@@ static void efx_rx_packet_gro(struct ef
        } else {
                struct sk_buff *skb = rx_buf->u.skb;
  
 -              EFX_BUG_ON_PARANOID(!checksummed);
 +              EFX_BUG_ON_PARANOID(!(rx_buf->flags & EFX_RX_PKT_CSUMMED));
                rx_buf->u.skb = NULL;
+               skb->ip_summed = CHECKSUM_UNNECESSARY;
  
                gro_result = napi_gro_receive(napi, skb);
        }

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

diff --cc drivers/net/ppp/ppp_generic.c
Simple merge

diff --cc drivers/net/vmxnet3/vmxnet3_drv.c
Simple merge

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

diff --cc net/atm/clip.c
Simple merge

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

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

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

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

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

diff --cc net/netfilter/nf_conntrack_netlink.c
Simple merge