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

Conflicts:
	drivers/net/xen-netback/netback.c

A bug fix overlapped with changing how the netback SKB control
block is implemented.

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

diff --cc drivers/net/ieee802154/at86rf230.c
index e8004ef73bc1c6a900f57b741d1780391cad769f,fbb83d175da31b4491e2d375ae7d6f0e846005ea..89417ac41083e59c2c44512ef804a7861ef1d1cc
--- 1/drivers/net/ieee802154/at86rf230.c
--- 2/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@@ -1247,8 -996,9 +1247,10 @@@ err_slp_tr
  static int at86rf230_remove(struct spi_device *spi)
  {
        struct at86rf230_local *lp = spi_get_drvdata(spi);
 +      struct at86rf230_platform_data *pdata = spi->dev.platform_data;
  
+       /* mask all at86rf230 irq's */
+       at86rf230_write_subreg(lp, SR_IRQ_MASK, 0);
        ieee802154_unregister_device(lp->dev);
  
        free_irq(spi->irq, lp);

diff --cc drivers/net/xen-netback/netback.c
index cb784fe5220cccbed4a62c33452d3c53655fa80d,cd0bd95ccc14b5ac4cac7e13aed5c58ba5280e23..ae34f5fc7fbc503f0feda999a0f729e5ab08cdc7
--- 1/drivers/net/xen-netback/netback.c
--- 2/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@@ -539,8 -531,13 +560,11 @@@ static void xenvif_rx_action(struct xen
                } else
                        vif->rx_last_skb_slots = 0;
  
 -              sco = (struct skb_cb_overlay *)skb->cb;
 -
+               old_req_cons = vif->rx.req_cons;
 -              sco->meta_slots_used = xenvif_gop_skb(skb, &npo);
 +              XENVIF_RX_CB(skb)->meta_slots_used = xenvif_gop_skb(skb, &npo);
-               BUG_ON(XENVIF_RX_CB(skb)->meta_slots_used > max_slots_needed);
+               ring_slots_used = vif->rx.req_cons - old_req_cons;
+ 
+               BUG_ON(ring_slots_used > max_slots_needed);
  
                __skb_queue_tail(&rxq, skb);
        }