Re: linux-next: manual merge of the net tree with Linus' tree
From: Cong Wang
Date: Tue Apr 06 2010 - 23:16:41 EST
Stephen Rothwell wrote:
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.
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@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/