Merge branches 'upstream-fixes', 'bkl-removal', 'debugfs-fixes' and 'hid-suspend...

diff --cc drivers/hid/hid-core.c
index 69fdf1e2347b3e4f6bc5070cc6859ea10cdc567f,143e788b729b1bdaadb4888e3568dac3a6714b0c,2e2aa759d230ebf80802120bdbe59f5357f1d8fa,86cb2c47e9ead091328b26e15a87b7a5622eaa61,2e2aa759d230ebf80802120bdbe59f5357f1d8fa..33cac4890ca4579589e220540289e0a815810662
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
--- 3/drivers/hid/hid-core.c
--- 4/drivers/hid/hid-core.c
--- 5/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@@@@ -1288,9 -1290,8 -1295,7 -1288,7 -1295,7 +1281,9 @@@@@@ static const struct hid_device_id hid_b
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
        { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
 ++++   { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
  +++   { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },

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

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

diff --cc include/linux/hid.h
Simple merge