linux-next: manual merge of the net tree with Linus' tree
in [Kernel]
|
Prev: ahci 0000:00:1f.2: controller reset failed (0xffffffff)
Next: linux-next: build failure after merge of the net tree
From: Stephen Rothwell on 6 Apr 2010 23:00 Hi all, Today's linux-next merge of the net tree got a conflict in drivers/net/bonding/bond_main.c between commit 9e2e61fbf8ad016d24e4af0afff13505f3dd2a2a ("bonding: fix potential deadlock in bond_uninit()") from Linus' tree and commit 22bedad3ce112d5ca1eaf043d4990fa2ed698c87 ("net: convert multicast list to list_head") from the net tree. Just context changes. If fixed it up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au diff --cc drivers/net/bonding/bond_main.c index 0075514,22682f1..0000000 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@@ -4550,9 -4476,10 +4508,7 @@@ static void bond_uninit(struct net_devi bond_remove_proc_entry(bond); - netif_addr_lock_bh(bond_dev); - bond_mc_list_destroy(bond); - netif_addr_unlock_bh(bond_dev); - if (bond->wq) - destroy_workqueue(bond->wq); - + __hw_addr_flush(&bond->mc_list); } /*------------------------- Module initialization ---------------------------*/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Cong Wang on 6 Apr 2010 23:20 Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net tree got a conflict in > drivers/net/bonding/bond_main.c between commit > 9e2e61fbf8ad016d24e4af0afff13505f3dd2a2a ("bonding: fix potential > deadlock in bond_uninit()") from Linus' tree and commit > 22bedad3ce112d5ca1eaf043d4990fa2ed698c87 ("net: convert multicast list to > list_head") from the net tree. > > Just context changes. If fixed it up (see below) and can carry the fix > for a while. Hi, Stephen, If I read the combined diff correctly, it looks fine for me. Thanks for letting me know! -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 7 Apr 2010 01:30
Hi, On Wed, 07 Apr 2010 11:20:09 +0800 Cong Wang <amwang(a)redhat.com> wrote: > > If I read the combined diff correctly, it looks fine for me. Thanks for the confirmation. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ |