Re: [PATCH -mm] Fix dev_load() compilation again

From: Johannes Berg
Date: Tue Sep 09 2008 - 02:28:24 EST


On Mon, 2008-09-08 at 15:17 -0700, Andrew Morton wrote:
> On Fri, 05 Sep 2008 12:54:51 -0700
> Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx> wrote:

> > in -next tree, this patch fixes the compilation error instead of
> > my patch. So, there is a conflict.

I think I like this patch better than Stephen's, but despite causing the
problem I'm not sure what I can do at this point.

> Give that there's already a fix in linux-next, I can't do anything here.
> Rusty, the regression was introduced by
> commit 4cb9da6ecc2b0e25056b45981239475f8509d59d
> Author: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
> AuthorDate: Wed Jul 9 10:28:42 2008 +0200
> Commit: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> CommitDate: Tue Aug 26 10:19:47 2008 +1000
> remove CONFIG_KMOD from net

Rusty, can you take

(although I'd rather see the blank line stay) and fold it into that
patch or put it into the tree that Stephen pulls?


Attachment: signature.asc
Description: This is a digitally signed message part