Merge remote-tracking branch 'hid/for-next'

Conflicts:
	drivers/hid/hid-core.c
	drivers/hid/hid-ids.h

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/hid/hid-apple.c
Simple merge

diff --cc drivers/hid/hid-core.c
index 242353df3dc450bbde4186f04740d66b422a970f,ed0cd0966ace28eb1eadb211e7a64fe7ec6fc7e6..023bee9b40730162ee7929c2bada6d09b386a037
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@ -1340,9 -1356,9 +1356,12 @@@ static const struct hid_device_id hid_h
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ISO) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_JIS) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ANSI) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ISO) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_JIS) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },

diff --cc drivers/hid/hid-ids.h
index 7d27d2b0445ac07f546e818dced2ce7125e189be,171ea8e810df6c6f9cd65a300e69e6b962abf2b3..df52af2b8a6de6e66377f2cbf8a1428b7c702248
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -109,9 -109,9 +109,12 @@@
  #define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI  0x0245
  #define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO   0x0246
  #define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS   0x0247
+ #define USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI  0x024c
+ #define USB_DEVICE_ID_APPLE_WELLSPRING6_ISO   0x024d
+ #define USB_DEVICE_ID_APPLE_WELLSPRING6_JIS   0x024e
 +#define USB_DEVICE_ID_APPLE_ALU_REVB_ANSI     0x024f
 +#define USB_DEVICE_ID_APPLE_ALU_REVB_ISO      0x0250
 +#define USB_DEVICE_ID_APPLE_ALU_REVB_JIS      0x0251
  #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI  0x0239
  #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO   0x023a
  #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS   0x023b

diff --cc drivers/hid/usbhid/hid-quirks.c
Simple merge