Messages in this thread | | | Date | Fri, 19 Nov 2010 11:17:06 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net tree with the net-current tree |
| |
Hi all,
Today's linux-next merge of the net tree got a conflict in drivers/net/bonding/bond_main.c between commit 3006bc38895895f1a0352c2e17e1a503f35f7e2f ("bonding: fix a race in IGMP handling") from the net-current tree and commit 866f3b25a2eb60d7529c227a0ecd80c3aba443fd ("bonding: IGMP handling cleanup") from the net tree.
I just assumed that the latter is a better solution and used that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |