Subject: Re: linux-next: manual merge of the net tree

From: David Miller <[email-masked]>
Date: Sun, 30 Nov 2008 23:20:55 -0800 (PST)

From: Stephen Rothwell <[email-masked]>
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.