From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 1 Dec 2008 14:26:23 +1100
> Hi Dave,
>
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/smc91x.c between commit
> f57628d76bd201a444ca822f3622522a44acbf60 ("section errors in
> smc911x/smc91x") from Linus' tree and commit smc_drv_probe ("smc91x: add
> __init markings to smc_drv_probe()") from the net tree.
>
> The former changed smc_drv_probe() to __devinit while the latter to
> __init. I used the latter and it can be fixed up in your tree.
>
> I do wonder why the former change didn't go through Jeff's tree ...
Linus applied a lot of things from Al today he shouldn't have.
--
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
