On Tue, 14 Apr 2009 17:24:57 PDT, [email protected] 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
[email protected] wrote:
> On Tue, 14 Apr 2009 17:24:57 PDT, [email protected] 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.
it depends on a patch that now has gone mainline....
On Wed, 15 Apr 2009 08:27:19 PDT, Arjan van de Ven said:
> it depends on a patch that now has gone mainline....
OK, I just reverted it locally, and will assume we just hit a race condition
with the timing of pull requests and when Andrew created the origin.patch
and linux-next.patch. If it's still wrecked in the next mmotm tarball that
Andrew posts, I'll follow up then.
On Wed, 15 Apr 2009 01:29:34 -0400 [email protected] wrote:
> On Tue, 14 Apr 2009 17:24:57 PDT, [email protected] 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?
The changelog:
: From: Arjan van de Ven <[email protected]>
:
: There are several DMI tables in the i8042 (keyboard) driver already, but
: not one for the i8042.reset option. This patch adds such an option (which
: also sets the nonfatal flag so that if the reset fails, the keyboard still
: works).
:
: Two users for this table are added as well, the MSI Wind U-100 and the LG
: X110. The MSI Wind also needs to be in the "don't trust the pnp data" for
: the touchpad to work on my machine.
On Wed, Apr 15, 2009 at 10:56:13AM -0700, Andrew Morton wrote:
> On Wed, 15 Apr 2009 01:29:34 -0400 [email protected] wrote:
>
> > On Tue, 14 Apr 2009 17:24:57 PDT, [email protected] 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