Merge branch 'for-4.7/upstream' into for-linus

Conflicts:
	drivers/hid/usbhid/hid-quirks.c

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

diff --cc drivers/hid/hid-ids.h
index e550a3a2b06df6cc8d331c2053b8332ad1eb9412,fa5b1287c0ae23c47f7d06da4d697cc798758306..3eec09a134cb66ac1b9e03f89e3c201cd1b48adb
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -259,8 -258,14 +259,15 @@@
  #define USB_VENDOR_ID_CORSAIR         0x1b1c
  #define USB_DEVICE_ID_CORSAIR_K90     0x1b02
  
+ #define USB_VENDOR_ID_CORSAIR           0x1b1c
+ #define USB_DEVICE_ID_CORSAIR_K70R      0x1b09
+ #define USB_DEVICE_ID_CORSAIR_K95RGB    0x1b11
+ #define USB_DEVICE_ID_CORSAIR_M65RGB    0x1b12
+ #define USB_DEVICE_ID_CORSAIR_K70RGB    0x1b13
+ #define USB_DEVICE_ID_CORSAIR_K65RGB    0x1b17
+ 
  #define USB_VENDOR_ID_CREATIVELABS    0x041e
 +#define USB_DEVICE_ID_CREATIVE_SB_OMNI_SURROUND_51    0x322c
  #define USB_DEVICE_ID_PRODIKEYS_PCMIDI        0x2801
  
  #define USB_VENDOR_ID_CVTOUCH         0x1ff7

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

diff --cc drivers/hid/usbhid/hid-quirks.c
index 53fc856d6867b032e6e2100c1c87c3bf5733702c,0ffcaf9cbe8113846c958ff495dfa435c45b80fc..b4b8c6abb03e130e5ee54d473fce11070d51eb81
--- 1/drivers/hid/usbhid/hid-quirks.c
--- 2/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@@ -71,7 -71,11 +71,12 @@@ static const struct hid_blacklist 
        { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_3AXIS_5BUTTON_STICK, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL },
+       { USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K70R, HID_QUIRK_NO_INIT_REPORTS },
+       { USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_M65RGB, HID_QUIRK_NO_INIT_REPORTS },
+       { USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K95RGB, HID_QUIRK_NO_INIT_REPORTS | HID_QUIRK_ALWAYS_POLL },
+       { USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K70RGB, HID_QUIRK_NO_INIT_REPORTS },
+       { USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K65RGB, HID_QUIRK_NO_INIT_REPORTS },
 +      { USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_CREATIVE_SB_OMNI_SURROUND_51, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_WIIU, HID_QUIRK_MULTI_INPUT },
        { USB_VENDOR_ID_ELAN, HID_ANY_ID, HID_QUIRK_ALWAYS_POLL },