Linus,

please pull from

  git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git for-linus

to receive HID merge window updates (this is a fixed version, v1 was by 
accident missing branch (which was present in linux-next)):

=====
- high-resolution scrolling support that gracefully handles differences 
  between MS and Logitech implementations in HW, from Peter Hutterer and 
  Harry Cutts
- MSI IRQ support for intel-ish driver, from Song Hongyan
- support for new hardware (Cougar 700K, Odys Winbook 13, ASUS FX503VD, 
  ASUS T101HA) from Daniel M. Lambea, Hans de Goede and Aleix Roca Nonell
- other small assorted fixups
=====

----------------------------------------------------------------
Aditya Pakki (1):
      HID: lenovo: Add checks to fix of_led_classdev_register

Aleix Roca Nonell (1):
      HID: asus: Add support for the ASUS T101HA keyboard dock

Chris Chiu (2):
      HID: use macros in IS_INPUT_APPLICATION
      HID: input: support Microsoft wireless radio control hotkey

Daniel M. Lambea (1):
      HID: cougar: Add support for Cougar 700K Gaming Keyboard

Hans de Goede (3):
      HID: asus: Add event handler to catch unmapped Asus Vendor UsagePage codes
      HID: asus: Add support for the ASUS FX503VD laptop
      HID: i2c-hid: Add Odys Winbook 13 to descriptor override

Harry Cutts (3):
      HID: logitech: Add function to enable HID++ 1.0 "scrolling acceleration"
      HID: logitech: Enable high-resolution scrolling on Logitech mice
      HID: logitech: Use LDJ_DEVICE macro for existing Logitech mice

Jiri Kosina (1):
      HID: hidraw: enforce minors_lock locking via lockdep

Jonathan Davies (1):
      HID: samples/hidraw: fix typo in printed message

Pan Bian (1):
      HID: intel-ish-hid: fixes incorrect error handling

Peter Hutterer (6):
      Input: add `REL_WHEEL_HI_RES` and `REL_HWHEEL_HI_RES`
      HID: core: store the collections as a basic tree
      HID: core: process the Resolution Multiplier
      HID: input: use the Resolution Multiplier for high-resolution scrolling
      HID: logitech-hidpp: fix typo, hiddpp to hidpp
      HID: doc: fix wrong data structure reference for UHID_OUTPUT

Song Hongyan (1):
      HID: intel-ish-hid: add MSI interrupt support

Yangtao Li (1):
      HID: debug: Change to use DEFINE_SHOW_ATTRIBUTE macro

 Documentation/hid/uhid.txt               |   2 +-
 Documentation/input/event-codes.rst      |  21 +-
 drivers/hid/hid-asus.c                   |  28 +++
 drivers/hid/hid-core.c                   | 174 ++++++++++++++
 drivers/hid/hid-cougar.c                 |   2 +
 drivers/hid/hid-debug.c                  |  12 +-
 drivers/hid/hid-ids.h                    |   3 +
 drivers/hid/hid-input.c                  | 108 ++++++++-
 drivers/hid/hid-lenovo.c                 |  10 +-
 drivers/hid/hid-logitech-hidpp.c         | 375 ++++++++++++++++++++++++++++---
 drivers/hid/hidraw.c                     |   8 +-
 drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c |   8 +
 drivers/hid/intel-ish-hid/ipc/pci-ish.c  |   7 +-
 drivers/hid/intel-ish-hid/ishtp-hid.c    |   2 +-
 include/linux/hid.h                      |  17 +-
 include/uapi/linux/input-event-codes.h   |   2 +
 samples/hidraw/hid-example.c             |   2 +-
 17 files changed, 720 insertions(+), 61 deletions(-)

-- 
Jiri Kosina
SUSE Labs

Reply via email to