2005-11-20 06:47:11

by Dmitry Torokhov

[permalink] [raw]
Subject: [git pull 00/14] Input updates for 2.6.15

Hi Linus,

Please consider pulling from:

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

It corrects couple of problems caused by recein input dynalloc
conversion, converts uinput driver to dynamic allocation and
adds new wistron button driver which was siting in -mm for quite
a while.

Vojtech, please bless the pull.

Changelog:

Fix missing initialization in ir-kbd-gpio.c
Fix an OOPS when initializing IR remote on saa7134
Input: make serio and gameport more swsusp friendly
Input: handle failures in input_register_device()
Input: uinput - don't use "interruptible" in FF code
Input: uinput - add UI_SET_SWBIT ioctl
Input: uinput - convert to dynalloc allocation
Input: wistron - disable wifi/bluetooth on suspend
Input: wistron - add PM support
Input: wistron - convert to dynamic input_dev allocation
Input: wistron - add support for Acer Aspire 1500 notebooks
Input: wistron - disable for x86_64
Input: add Wistron driver
Input: atkbd - speed up setting leds/repeat state

Diffstat:

MAINTAINERS | 5
drivers/input/gameport/gameport.c | 12
drivers/input/input.c | 63 +--
drivers/input/keyboard/atkbd.c | 99 +++-
drivers/input/misc/Kconfig | 10
drivers/input/misc/Makefile | 1
drivers/input/misc/uinput.c | 323 ++++++++--------
drivers/input/misc/wistron_btns.c | 561 ++++++++++++++++++++++++++++
drivers/input/serio/serio.c | 12
drivers/media/video/ir-kbd-gpio.c | 5
drivers/media/video/saa7134/saa7134-input.c | 2
include/linux/uinput.h | 13
12 files changed, 880 insertions(+), 226 deletions(-)

--
Dmitry


2005-11-20 08:38:08

by Vojtech Pavlik

[permalink] [raw]
Subject: Re: [git pull 00/14] Input updates for 2.6.15

On Sun, Nov 20, 2005 at 01:36:11AM -0500, Dmitry Torokhov wrote:

> Hi Linus,
>
> Please consider pulling from:
>
> master.kernel.org:/pub/scm/linux/kernel/git/dtor/input.git
>
> It corrects couple of problems caused by recein input dynalloc
> conversion, converts uinput driver to dynamic allocation and
> adds new wistron button driver which was siting in -mm for quite
> a while.
>
> Vojtech, please bless the pull.

Yup, I have no objections at all. Thanks, Dmitry!

Linus, please pull these changes into your tree.

> Changelog:
>
> Fix missing initialization in ir-kbd-gpio.c
> Fix an OOPS when initializing IR remote on saa7134
> Input: make serio and gameport more swsusp friendly
> Input: handle failures in input_register_device()
> Input: uinput - don't use "interruptible" in FF code
> Input: uinput - add UI_SET_SWBIT ioctl
> Input: uinput - convert to dynalloc allocation
> Input: wistron - disable wifi/bluetooth on suspend
> Input: wistron - add PM support
> Input: wistron - convert to dynamic input_dev allocation
> Input: wistron - add support for Acer Aspire 1500 notebooks
> Input: wistron - disable for x86_64
> Input: add Wistron driver
> Input: atkbd - speed up setting leds/repeat state
>
> Diffstat:
>
> MAINTAINERS | 5
> drivers/input/gameport/gameport.c | 12
> drivers/input/input.c | 63 +--
> drivers/input/keyboard/atkbd.c | 99 +++-
> drivers/input/misc/Kconfig | 10
> drivers/input/misc/Makefile | 1
> drivers/input/misc/uinput.c | 323 ++++++++--------
> drivers/input/misc/wistron_btns.c | 561 ++++++++++++++++++++++++++++
> drivers/input/serio/serio.c | 12
> drivers/media/video/ir-kbd-gpio.c | 5
> drivers/media/video/saa7134/saa7134-input.c | 2
> include/linux/uinput.h | 13
> 12 files changed, 880 insertions(+), 226 deletions(-)

--
Vojtech Pavlik
SuSE Labs, SuSE CR

2005-11-20 17:04:11

by Dmitry Torokhov

[permalink] [raw]
Subject: Re: [git pull 00/14] Input updates for 2.6.15

On Sunday 20 November 2005 01:36, Dmitry Torokhov wrote:
> Hi Linus,
>
> Please consider pulling from:
>
> master.kernel.org:/pub/scm/linux/kernel/git/dtor/input.git
>
> It corrects couple of problems caused by recein input dynalloc
> conversion, converts uinput driver to dynamic allocation and
> adds new wistron button driver which was siting in -mm for quite
> a while.
>

Linus, please hold off the pull - I messed up authorship of Wistron
driver in commit history plus there is another fix for cinergyT2 driver.

I will redo the tree...

--
Dmitry

2005-11-20 17:19:36

by Linus Torvalds

[permalink] [raw]
Subject: Re: [git pull 00/14] Input updates for 2.6.15



On Sun, 20 Nov 2005, Dmitry Torokhov wrote:
>
> Linus, please hold off the pull - I messed up authorship of Wistron
> driver in commit history plus there is another fix for cinergyT2 driver.

Too late. Already pulled, and more importantly, already pushed out.

Linus

2005-11-20 17:42:11

by Dmitry Torokhov

[permalink] [raw]
Subject: Re: [git pull 00/14] Input updates for 2.6.15

On Sunday 20 November 2005 12:19, Linus Torvalds wrote:
>
> On Sun, 20 Nov 2005, Dmitry Torokhov wrote:
> >
> > Linus, please hold off the pull - I messed up authorship of Wistron
> > driver in commit history plus there is another fix for cinergyT2 driver.
>
> Too late. Already pulled, and more importantly, already pushed out.
>

Oh, ok.. Hopefully Miloslav will forgive me.

That cinergyT2 fix (from Linux-2.6.15-rc2 thread) - do you already have it
or would you prefer a pull prepared later tonight?

--
Dmitry

2005-11-20 18:17:49

by Linus Torvalds

[permalink] [raw]
Subject: Re: [git pull 00/14] Input updates for 2.6.15



On Sun, 20 Nov 2005, Dmitry Torokhov wrote:
>
> That cinergyT2 fix (from Linux-2.6.15-rc2 thread) - do you already have it
> or would you prefer a pull prepared later tonight?

The only one I have is the one I got through davem a couple of days ago:

cinergyT2: cinergyt2_register_rc() should return 0 on success

is that the one you're talking about?

Linus

2005-11-22 03:40:47

by Dmitry Torokhov

[permalink] [raw]
Subject: Re: [git pull 00/14] Input updates for 2.6.15

On Sunday 20 November 2005 13:17, Linus Torvalds wrote:
>
> On Sun, 20 Nov 2005, Dmitry Torokhov wrote:
> >
> > That cinergyT2 fix (from Linux-2.6.15-rc2 thread) - do you already have it
> > or would you prefer a pull prepared later tonight?
>
> The only one I have is the one I got through davem a couple of days ago:
>
> cinergyT2: cinergyt2_register_rc() should return 0 on success
>
> is that the one you're talking about?
>

Sorry for the delay...

I see that you already merged the patch I was talking about:

db93a82fa9d8b4d6e31c227922eaae829253bb88 [PATCH] Fix an OOPS is CinergyT2

--
Dmitry