Messages in this thread | | | Subject | Re: [PATCH -mm] Fix dev_load() compilation again | From | Johannes Berg <> | Date | Tue, 09 Sep 2008 08:27:55 +0200 |
| |
Hi,
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@ct.jp.nec.com> 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@sipsolutions.net> > AuthorDate: Wed Jul 9 10:28:42 2008 +0200 > Commit: Stephen Rothwell <sfr@canb.auug.org.au> > CommitDate: Tue Aug 26 10:19:47 2008 +1000 > > remove CONFIG_KMOD from net
Rusty, can you take http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.27-rc5/2.6.27-rc5-mm1/broken-out/net-fix-compilation-ng-when-config_module.patch
(although I'd rather see the blank line stay) and fold it into that patch or put it into the tree that Stephen pulls?
johannes [unhandled content-type:application/pgp-signature] | |