Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index cff3485d9673..989b742551ac 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -992,7 +992,6 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
                 VMXNET3_WRITE_BAR0_REG(adapter, VMXNET3_REG_TXPROD,
                                        tq->tx_ring.next2fill);
         }
-        netdev->trans_start = jiffies;
 
         return NETDEV_TX_OK;
 
@@ -1174,7 +1173,6 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
                                 netif_receive_skb(skb);
                         }
 
-                        adapter->netdev->last_rx = jiffies;
                         ctx->skb = NULL;
                 }
 
@@ -1371,13 +1369,12 @@ vmxnet3_rq_create(struct vmxnet3_rx_queue *rq, struct vmxnet3_adapter *adapter)
 
         sz = sizeof(struct vmxnet3_rx_buf_info) * (rq->rx_ring[0].size +
                                                    rq->rx_ring[1].size);
-        bi = kmalloc(sz, GFP_KERNEL);
+        bi = kzalloc(sz, GFP_KERNEL);
         if (!bi) {
                 printk(KERN_ERR "%s: failed to allocate rx bufinfo\n",
                        adapter->netdev->name);
                 goto err;
         }
-        memset(bi, 0, sz);
         rq->buf_info[0] = bi;
         rq->buf_info[1] = bi + rq->rx_ring[0].size;
 
@@ -1675,11 +1672,11 @@ vmxnet3_copy_mc(struct net_device *netdev)
                 /* We may be called with BH disabled */
                 buf = kmalloc(sz, GFP_ATOMIC);
                 if (buf) {
-                        struct dev_mc_list *mc;
+                        struct netdev_hw_addr *ha;
                         int i = 0;
 
-                        netdev_for_each_mc_addr(mc, netdev)
-                                memcpy(buf + i++ * ETH_ALEN, mc->dmi_addr,
+                        netdev_for_each_mc_addr(ha, netdev)
+                                memcpy(buf + i++ * ETH_ALEN, ha->addr,
                                        ETH_ALEN);
                 }
         }