Re: mmotm 2009-04-14-17-24 uploaded

From: Dmitry Torokhov
Date: Wed Apr 15 2009 - 22:10:27 EST


On Wed, Apr 15, 2009 at 10:56:13AM -0700, Andrew Morton wrote:
> On Wed, 15 Apr 2009 01:29:34 -0400 Valdis.Kletnieks@xxxxxx wrote:
>
> > On Tue, 14 Apr 2009 17:24:57 PDT, akpm@xxxxxxxxxxxxxxxxxxxx said:
> > > The mm-of-the-moment snapshot 2009-04-14-17-24 has been uploaded to
> > >
> > > http://userweb.kernel.org/~akpm/mmotm/
> >
> > patch input-add-a-dmi-table-for-the-i8042reset-option-make-msi-wind-u-100-work.patch
> > is horribly busticated - was this dependent on another patch that was dropped?
> > The reference to 'i8042_nonfatal' is odd, I can't find it defined anywhere in the tree.
> >
> > CC drivers/input/serio/i8042.o
> > In file included from drivers/input/serio/i8042.h:28,
> > from drivers/input/serio/i8042.c:85:
> > drivers/input/serio/i8042-x86ia64io.h:501: error: redefinition of 'i8042_dmi_reset_table'
> > drivers/input/serio/i8042-x86ia64io.h:380: note: previous definition of 'i8042_dmi_reset_table' was here
> > drivers/input/serio/i8042-x86ia64io.h: In function 'i8042_pnp_init':
> > drivers/input/serio/i8042-x86ia64io.h:619: error: 'i8042_nonfatal' undeclared (first use in this function)
> > drivers/input/serio/i8042-x86ia64io.h:619: error: (Each undeclared identifier is reported only once
> > drivers/input/serio/i8042-x86ia64io.h:619: error: for each function it appears in.)
> > make[2]: *** [drivers/input/serio/i8042.o] Error 1
> >
>
> Sorry, someone merged something else and I had a big reject to fix and
> I never got around to actually testing it and and and. And Dmitry
> doesn't seem very interested in the patch anyway.
>
> I'll drop it for now - Arjan, please resend anything which you think we
> still need.
>
> Actually, it appears that I tried to get that patch into 2.6.29 and
> we're now missing 2.6.30. What's happening here? Dmitry?
>

I had some concerns but they have been resolved after I had a chance to
talk to Arjan at the collaboration summit. The patch (both paches,
actually), in a bit modified form, is in my 'next' branch and I am
planning to ask Linus to pull it with the other small fixes in the next
day or so.

--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/