Skip to contentSkip to conversation

Input patches for 2.6.20

GIT PULL Dmitry Torokhov 5 participants 6 messages Feb 18, 2007 – May 5, 2007

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please consider pulling 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 input subsystem.

Changelog:
----------

Cyrill V. Gorcunov (1):
Input: HIL - fix improper call to release_region()

Dmitry Torokhov (5):
Input: psmouse - properly reset mouse on shutdown/suspend
Input: i8042 - let serio bus suspend ports
Input: do not lock device when showing name, phys and uniq
Input: hid-lgff - treat devices as joysticks unless told otherwise
Input: remove obsolete setup parameters from input drivers

Philipp Zabel (1):
Input: gpio-keys - switch to common GPIO API

Valentin Zagura (1):
Input: HID - add support for Logitech Formula Force EX

Diffstat:
---------

 b/drivers/input/input.c               |   17 +---------
 b/drivers/input/joystick/amijoy.c     |    2 -
 b/drivers/input/joystick/analog.c     |    2 -
 b/drivers/input/joystick/db9.c        |    4 --
 b/drivers/input/joystick/gamecon.c    |    6 ---
 b/drivers/input/joystick/turbografx.c |    4 --
 b/drivers/input/keyboard/Kconfig      |    6 +--
 b/drivers/input/keyboard/atkbd.c      |    4 --
 b/drivers/input/keyboard/gpio_keys.c  |   15 ++++-----
 b/drivers/input/keyboard/hilkbd.c     |    2 +
 b/drivers/input/mouse/inport.c        |    2 -
 b/drivers/input/mouse/logibm.c        |    2 -
 b/drivers/input/mouse/psmouse-base.c  |    6 ---
 b/drivers/input/mouse/psmouse.h       |    1 
 b/drivers/input/mouse/synaptics.c     |    1 
 b/drivers/input/serio/i8042.c         |    7 ----
 b/drivers/input/serio/serio.c         |   36 +++++++++++++++++++++
 b/drivers/usb/input/Kconfig           |    6 +++
 b/drivers/usb/input/hid-ff.c          |    3 +
 b/drivers/usb/input/hid-lgff.c        |   10 +++---
 b/include/linux/serio.h               |    6 ---
 drivers/input/mouse/psmouse-base.c    |   28 +++++++++++++++++
 drivers/input/serio/i8042.c           |   56 +++++++++++++++++-----------------
 drivers/usb/input/hid-lgff.c          |    2 +
 24 files changed, 124 insertions(+), 104 deletions(-)
Signature · 1 line
Dmitry
#1 lore raw
Quoted 10 lines · Dmitry Torokhov

Hi Linus,

Please consider pulling 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 input subsystem.

Linus,

If you have not pulled yet 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

because master branch will have extra stuff in the next minute or so.

Signature · 1 line
Dmitry
#2 lore raw
Quoted 6 lines · Dmitry Torokhov

If you have not pulled yet please pull from:

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

because master branch will have extra stuff in the next minute or so.

Hmm. That thing had a conflict with the driver core changes I just pulled from Greg due to Greg removing "struct subsystem".

The conflict looked really trivial, and I fixed up the obvious places, probably correctly. Please verify.

Martin, in the process I noticed that the new file

	arch/s390/kernel/ipl.c

seems to be broken by the same thing after the driver core merge. The fix _looks_ equally trivial (change *subsys.kset.kobj into just *subsys.kobj), but I didn't do that trivial thing, because I cannot even test-compile the end result. So can you give it a quick look, please?

Greg - maybe more of a heads-up to people next time you do something like this? Did this removal hit -mm? Anyway, it looks like something trivial to fix up after, but ..

Linus

#3 lore raw
Quoted 16 lines · Linus Torvalds
Quoted 6 lines · Dmitry Torokhov

If you have not pulled yet please pull from:

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

because master branch will have extra stuff in the next minute or so.

Hmm. That thing had a conflict with the driver core changes I just pulled from Greg due to Greg removing "struct subsystem".

The conflict looked really trivial, and I fixed up the obvious places, probably correctly. Please verify.

Quoted 8 lines

Martin, in the process I noticed that the new file

	arch/s390/kernel/ipl.c

seems to be broken by the same thing after the driver core merge. The fix _looks_ equally trivial (change *subsys.kset.kobj into just *subsys.kobj), but I didn't do that trivial thing, because I cannot even test-compile the end result. So can you give it a quick look, please?

Martin, Cornelia already sent me (and lkml) a patch to fix this all up if you want to just use that instead.

Quoted 3 lines

Greg - maybe more of a heads-up to people next time you do something like this? Did this removal hit -mm? Anyway, it looks like something trivial to fix up after, but ..

Yes, this was in -mm for quite a while, and yes, I knew about the conflict with the input tree, that's why I waited to send this to you separate from the first merge set and in the second batch, thinking that either had already sent his stuff, or was going to do so afterwards, and would be trivial to fix up.

Sorry about that, sometimes core changes like this take a bit of coordination across subsystems.

thanks,

greg k-h

#4 lore raw
Quoted 2 lines · On Fri, 4 May 2007 23:03:38 -0700 Greg KH <[email protected]> wrote:

Sorry about that, sometimes core changes like this take a bit of coordination across subsystems.

tell me about it.

I often end up maintaining patches which fix susbsystem A for subsystem B. And patches which fix patch A for patch B:

box:/usr/src/25> grep '[-]vs-' series
fix-refrigerator-vs-thaw_process-race.patch pata_acpi-restore-driver-vs-libata-clean-up-sff-init-mess-fix.patch
git-ioat-vs-git-md-accel.patch
#git-wireless-vs-git-net.patch
#git-wireless-vs-git-net-2.patch
#git-wireless-vs-git-net-3.patch
#mm-fix-fault-vs-invalidate-race-for-linear-mappings.patch: Hugh issues mm-fix-fault-vs-invalidate-race-for-linear-mappings.patch mm-debug-check-for-the-fault-vs-invalidate-race.patch
mm-fix-clear_page_dirty_for_io-vs-fault-race.patch
#git-block-vs-ext4-ext4-delayed-allocation.patch call-cpu_chain-with-cpu_down_failed-if-cpu_down_prepare-failed-vs-reduce-size-of-task_struct-on-64-bit-machines.patch workqueue-fix-flush_workqueue-vs-cpu_dead-race.patch fix-kthread_create-vs-freezer-theoretical-race.patch revoke-special-mmap-handling-vs-fault-vs-invalidate.patch lguest-vs-x86_64-mm-use-per-cpu-variables-for-gdt-pda.patch lguest-the-host-code-vs-x86_64-mm-i386-separate-hardware-defined-tss-from-linux-additions.patch #lguest-the-host-code-vs-sys_futex64-allows-64bit-futexes-get_futex_key-must-check-proper-alignement-for-64bit-futexes.patch lguest-the-host-code-vs-futex-new-private-futexes.patch acpi-keep-tsc-stable-when-lapic_timer_c2_ok-is-set-vs-x86_64-mm-log-reason-why-tsc-was-marked-unstable.patch #proc-maps-protection-vs-utrace.patch
#utrace-vs-reduce-size-of-task_struct-on-64-bit-machines.patch make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
#git-block reiser4-vs-git-block.patch
#git-block reiser4-vs-git-block-2.patch
#git-block reiser4-vs-git-block3.patch
#git-kgdb-vs-define-struct-pspace.patch

but it takes a little time to get these propagated into the right place..

#5 lore raw
In reply to Greg KH
Quoted 11 lines · Greg KH
Quoted 8 lines

Martin, in the process I noticed that the new file

      arch/s390/kernel/ipl.c

seems to be broken by the same thing after the driver core merge. The fix _looks_ equally trivial (change *subsys.kset.kobj into just *subsys.kobj), but I didn't do that trivial thing, because I cannot even test-compile the end result. So can you give it a quick look, please?

Martin, Cornelia already sent me (and lkml) a patch to fix this all up if you want to just use that instead.

Nod, Cornelia already found and fixed this problem, so it will be easy for us to correct the code even if it gets broken in the upstream tree for a short while. So from our perspective just go ahead and pull.

Signature · 4 lines
blue skies,
  Martin.

"Reality continues to ruin my life." - Calvin.