Messages in this thread | | | Date | Wed, 07 Apr 2010 11:20:09 +0800 | From | Cong Wang <> | Subject | Re: linux-next: manual merge of the net tree with Linus' tree |
| |
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!
| |