On Tue, Nov 24, 2009 at 11:37:17AM +1100, Stephen Rothwell wrote: > Hi Ralf, > > Today's linux-next merge of the mips tree got a conflict in > drivers/net/au1000_eth.c between commit > 63edaf647607795a065e6956a79c47f500dc8447 ("Au1x00: fix crash when trying > register_netdev()") from the net-current tree and commit > 6cdbc95856e7f4ab4e7b2f2bdab5c3844537ad83 ("NET: au1000-eth: convert to > platform_driver model") from the mips tree. > > It looks to me that the mips tree change supercedes the net-current one > (since it moves the register_netdev() call much later), so I just used > this file from the mips tree. I agree. David, can you just drop the net-current patch then? This fix is still needed for -stable however. Ralf -- 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