Merge branches 'for-4.1/upstream-fixes', 'for-4.2/upstream' and 'for-4.2/logitech...

Conflicts:
	drivers/hid/hid-logitech-hidpp.c

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

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/hid/hid-logitech-hidpp.c
index 5fd530acf747c50fcd5bfbd51d19d3271e5d716b,b3cf6fd4be96473ba62ebbbf92d1522c024a509e,394a6f41af0909780136a4d1dcb1b0c37062b5c7..484196459305577c19433fe4fe35b21c2ac39905
--- 1/drivers/hid/hid-logitech-hidpp.c
--- 2/drivers/hid/hid-logitech-hidpp.c
--- 3/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
@@@@ -40,10 -40,11 -40,12 +40,11 @@@@ MODULE_PARM_DESC(disable_raw_mode
   #define HIDPP_REPORT_LONG_LENGTH             20
   
   #define HIDPP_QUIRK_CLASS_WTP                        BIT(0)
++ #define HIDPP_QUIRK_CLASS_M560                       BIT(1)
   
-- /* bits 1..20 are reserved for classes */
++ /* bits 2..20 are reserved for classes */
   #define HIDPP_QUIRK_DELAYED_INIT             BIT(21)
   #define HIDPP_QUIRK_WTP_PHYSICAL_BUTTONS     BIT(22)
 --#define HIDPP_QUIRK_MULTI_INPUT                      BIT(23)
   
   /*
    * There are two hidpp protocols in use, the first version hidpp10 is known
@@@@ -1281,6 -1296,11 -1513,15 +1498,10 @@@@ static const struct hid_device_id hidpp
          HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH,
                USB_DEVICE_ID_LOGITECH_T651),
          .driver_data = HIDPP_QUIRK_CLASS_WTP },
 --     { /* Keyboard TK820 */
  -       HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE,
  -             USB_VENDOR_ID_LOGITECH, 0x4102),
  -       .driver_data = HIDPP_QUIRK_DELAYED_INIT | HIDPP_QUIRK_MULTI_INPUT |
  -                      HIDPP_QUIRK_CLASS_WTP },
++      { /* Mouse logitech M560 */
+         HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE,
 -              USB_VENDOR_ID_LOGITECH, 0x4102),
 -        .driver_data = HIDPP_QUIRK_DELAYED_INIT | HIDPP_QUIRK_MULTI_INPUT |
 -                       HIDPP_QUIRK_CLASS_WTP },
++              USB_VENDOR_ID_LOGITECH, 0x402d),
++        .driver_data = HIDPP_QUIRK_DELAYED_INIT | HIDPP_QUIRK_CLASS_M560 },
   
        { HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE,
                USB_VENDOR_ID_LOGITECH, HID_ANY_ID)},

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

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