On Wed, Jul 21, 2010 at 12:04:48PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net tree got a conflict in > net/bridge/br_device.c between commit > 573201f36fd9c7c6d5218cdcd9948cee700b277d ("bridge: Partially disable > netpoll support") from Linus' tree and commit > 91d2c34a4eed32876ca333b0ca44f3bc56645805 ("bridge: Fix netpoll support") > from the net tree. > > The net tree commit seems to be a fuller fix, so I used that. Yeah, 573201f is just the temporary fix for 2.6.35. Thanks, -- Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html