* [git pull] Input updates for 4.7-rc0 (part 2)
@ 2016-05-28 0:19 Dmitry Torokhov
0 siblings, 0 replies; only message in thread
From: Dmitry Torokhov @ 2016-05-28 0:19 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, linux-input
Hi Linus,
Please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git for-linus
to receive updates for the input subsystem. Just a few more driver
fixes; new drivers will be coming in the next merge window.
There will be a trivial conflict in drivers/input/misc/pwm-beeper.c,
please keep both parts so you'll end up with the following chunk:
/*
* FIXME: pwm_apply_args() should be removed when switching to
* the atomic PWM API.
*/
pwm_apply_args(beeper->pwm);
INIT_WORK(&beeper->work, pwm_beeper_work);
Changelog:
---------
Cameron Gutman (1):
Input: xpad - prevent spurious input from wired Xbox 360 controllers
Manfred Schlaegl (1):
Input: pwm-beeper - fix - scheduling while atomic
Pavel Rojtberg (3):
Input: xpad - move pending clear to the correct location
Input: xpad - add more third-party controllers
Input: xpad - xbox one elite controller support
Ricky Liang (1):
Input: uinput - handle compat ioctl for UI_SET_PHYS
Diffstat:
--------
drivers/input/joystick/xpad.c | 18 +++++++++--
drivers/input/misc/pwm-beeper.c | 69 ++++++++++++++++++++++++++++-------------
drivers/input/misc/uinput.c | 6 ++++
3 files changed, 70 insertions(+), 23 deletions(-)
--
Dmitry
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-05-28 0:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-28 0:19 [git pull] Input updates for 4.7-rc0 (part 2) Dmitry Torokhov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.