diff mbox

[GIT,PULL] please pull infiniband.git

Message ID 20130905103116.6998495cd755f5ae2c3def78@canb.auug.org.au
State Not Applicable, archived
Delegated to: David Miller
Headers show

Commit Message

Stephen Rothwell Sept. 5, 2013, 12:31 a.m. UTC 
Hi Linus,

On Wed,  4 Sep 2013 10:03:38 -0700 Roland Dreier <roland@kernel.org> 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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Linus Torvalds Sept. 5, 2013, 4:42 p.m. UTC | #1 
On Wed, Sep 4, 2013 at 5:31 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I am carrying the following merge fix patch for a semantic conflict
> between this tree and Dave's net-next tree:

Ok. I haven't gotten David's pull request yet, and unless I get it
later today I'll probably forget this.

David, mind reminding me when you do send (or maybe cc'ing Stephen, so
that he will)?

                  Linus
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller Sept. 5, 2013, 4:43 p.m. UTC | #2 
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Sep 2013 09:42:05 -0700

> On Wed, Sep 4, 2013 at 5:31 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> I am carrying the following merge fix patch for a semantic conflict
>> between this tree and Dave's net-next tree:
> 
> Ok. I haven't gotten David's pull request yet, and unless I get it
> later today I'll probably forget this.
> 
> David, mind reminding me when you do send (or maybe cc'ing Stephen, so
> that he will)?

Sure, I was planning on send out the pull request by the end of today.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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