Hi Linus, On Wed, 4 Sep 2013 10:03:38 -0700 Roland Dreier wrote: > > Please pull from > > git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git tags/rdma-for-linus I am carrying the following merge fix patch for a semantic conflict between this tree and Dave's net-next tree: From: Stephen Rothwell Date: Tue, 13 Aug 2013 13:01:49 +1000 Subject: [PATCH] cxgb4: fix up for bond_for_each_slave API change Signed-off-by: Stephen Rothwell --- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index 038df4b..b6ad557 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -3982,7 +3982,6 @@ static int cxgb4_inet6addr_handler(struct notifier_block *this, struct inet6_ifaddr *ifa = data; struct net_device *event_dev; int ret = NOTIFY_DONE; - int cnt; struct bonding *bond = netdev_priv(ifa->idev->dev); struct slave *slave; struct pci_dev *first_pdev = NULL; @@ -3996,7 +3995,7 @@ static int cxgb4_inet6addr_handler(struct notifier_block *this, * in all of them only once. */ read_lock(&bond->lock); - bond_for_each_slave(bond, slave, cnt) { + bond_for_each_slave(bond, slave) { if (!first_pdev) { ret = clip_add(slave->dev, ifa, event); /* If clip_add is success then only initialize -- 1.8.4.rc0 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au