Skip to contentSkip to conversation

Input updates for 2.6.26-rc6

GIT PULL Dmitry Torokhov 2 participants 3 messages Jun 17, 2008 – Jun 18, 2008

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please pull from:

git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git for-linus
or
master.kernel.org:/pub/scm/linux/kernel/git/dtor/input.git for-linus

to receive updates for the input subsystem. There will be a small conflict in drivers/usb/core/quirks.c, I hope this is OK because I don't like to have merges on my 'for-linus' branch except for the one done in merge window for the next release. This way one can clearly see what went in into a release after the initial merge.

Changelog:
---------

Jiri Kosina (2):
Input: i8042 - add Fujitsu-Siemens Amilo Pro V2030 to nomux table
Input: i8042 - retry failed CTR writes when resuming

Oliver Neukum (1):
Input: appletouch - implement reset-resume logic

Stas Sergeev (1):
Input: pcspkr - remove negative dependency on snd-pcsp

Diffstat:
--------

 drivers/input/misc/Kconfig            |    1 -
 drivers/input/mouse/appletouch.c      |   49 +++++++++++++++++++++++++++-----
 drivers/input/serio/i8042-x86ia64io.h |    7 +++++
 drivers/input/serio/i8042.c           |    8 ++++-
 drivers/usb/core/quirks.c             |    3 ++
 5 files changed, 57 insertions(+), 11 deletions(-)
Signature · 1 line
Dmitry
#1 lore raw
Quoted 14 lines · Dmitry Torokhov

Hi Linus,

Please pull from:

git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git for-linus
or
master.kernel.org:/pub/scm/linux/kernel/git/dtor/input.git for-linus

to receive updates for the input subsystem. There will be a small conflict in drivers/usb/core/quirks.c, I hope this is OK because I don't like to have merges on my 'for-linus' branch except for the one done in merge window for the next release. This way one can clearly see what went in into a release after the initial merge.

Quoted 6 lines

Changelog:
---------

Jiri Kosina (2):
Input: i8042 - add Fujitsu-Siemens Amilo Pro V2030 to nomux table
Input: i8042 - retry failed CTR writes when resuming

Hi Dmitry,

how about my patch

Input: i8042 - add Intel D845PESV to nopnp list

Not that it couldn't wait for next merge window, I just want to make sure that it doesn't get lost.

Thanks,

Signature · 2 lines
Jiri Kosina
SUSE Labs
#2 lore raw

Hi Jiri,

Quoted 10 lines · Jiri Kosina

Hi Dmitry,

how about my patch

Input: i8042 - add Intel D845PESV to nopnp list

Not that it couldn't wait for next merge window, I just want to make sure that it doesn't get lost.

It is in my 'next' branch. Since 'nopnp' list is new I thought the patch should wait for .27.

Signature · 1 line
Dmitry