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, 6 insertions, 6 deletions

diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index f8c36a5eb4d7..b150c102ca5a 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -390,18 +390,19 @@ static void emac_hash_mc(struct emac_instance *dev)
         const int regs = EMAC_XAHT_REGS(dev);
         u32 *gaht_base = emac_gaht_base(dev);
         u32 gaht_temp[regs];
-        struct dev_mc_list *dmi;
+        struct netdev_hw_addr *ha;
         int i;
 
         DBG(dev, "hash_mc %d" NL, netdev_mc_count(dev->ndev));
 
         memset(gaht_temp, 0, sizeof (gaht_temp));
 
-        netdev_for_each_mc_addr(dmi, dev->ndev) {
+        netdev_for_each_mc_addr(ha, dev->ndev) {
                 int slot, reg, mask;
-                DBG2(dev, "mc %pM" NL, dmi->dmi_addr);
+                DBG2(dev, "mc %pM" NL, ha->addr);
 
-                slot = EMAC_XAHT_CRC_TO_SLOT(dev, ether_crc(ETH_ALEN, dmi->dmi_addr));
+                slot = EMAC_XAHT_CRC_TO_SLOT(dev,
+                                             ether_crc(ETH_ALEN, ha->addr));
                 reg = EMAC_XAHT_SLOT_TO_REG(dev, slot);
                 mask = EMAC_XAHT_SLOT_TO_MASK(dev, slot);
 
@@ -1178,7 +1179,7 @@ static int emac_open(struct net_device *ndev)
                 netif_carrier_on(dev->ndev);
 
         /* Required for Pause packet support in EMAC */
-        dev_mc_add(ndev, default_mcast_addr, sizeof(default_mcast_addr), 1);
+        dev_mc_add_global(ndev, default_mcast_addr);
 
         emac_configure(dev);
         mal_poll_add(dev->mal, &dev->commac);
@@ -1701,7 +1702,6 @@ static int emac_poll_rx(void *param, int budget)
 
                 skb_put(skb, len);
         push_packet:
-                skb->dev = dev->ndev;
                 skb->protocol = eth_type_trans(skb, dev->ndev);
                 emac_rx_csum(dev, skb, ctrl);