Merge branches 'upstream', 'upstream-fixes' and 'debugfs' into for-linus

diff --cc drivers/hid/Kconfig
index aba8facecce83cf4467c8ab0a18b326b6779ffe4,7831a0318d3ca5bad508d0a74d884c5013eabced,05950a783560b19475fd74de0c34e15005ed9075..111afbe8de038e949cab63cdf936c63bc4002381
--- 1/drivers/hid/Kconfig
--- 2/drivers/hid/Kconfig
--- 3/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@@ -309,45 -301,45 -248,21 +294,45 @@@@ config HID_TOPSEE
        ---help---
        Say Y if you have a TopSeed Cyberlink remote control.
   
  -config THRUSTMASTER_FF
  -     tristate "ThrustMaster devices support"
  +config HID_THRUSTMASTER
  +     tristate "ThrustMaster devices support" if EMBEDDED
        depends on USB_HID
  -     select INPUT_FF_MEMLESS
  -     help
  +     default !EMBEDDED
  +     ---help---
          Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or
  -       a THRUSTMASTER Ferrari GT Rumble Force or Force Feedback Wheel.
  +       a THRUSTMASTER Ferrari GT Rumble Wheel.
   
  -config ZEROPLUS_FF
  -     tristate "Zeroplus based game controller support"
  -     depends on USB_HID
  +config THRUSTMASTER_FF
  +     bool "ThrustMaster devices force feedback support"
  +     depends on HID_THRUSTMASTER
        select INPUT_FF_MEMLESS
  -     help
  +     ---help---
 -        Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or
 -        a THRUSTMASTER Ferrari GT Rumble Force or Force Feedback Wheel and
 -        want to enable force feedback support for it.
 ++       Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or 3,
 ++       a THRUSTMASTER Dual Trigger 3-in-1 or a THRUSTMASTER Ferrari GT
 ++       Rumble Force or Force Feedback Wheel.
  +
  +config HID_WACOM
  +     tristate "Wacom Bluetooth devices support" if EMBEDDED
  +     depends on BT_HIDP
  +     default !EMBEDDED
  +     ---help---
  +     Support for Wacom Graphire Bluetooth tablet.
  +
  +config HID_ZEROPLUS
  +     tristate "Zeroplus based game controller support" if EMBEDDED
  +     depends on USB_HID
  +     default !EMBEDDED
  +     ---help---
          Say Y here if you have a Zeroplus based game controller.
   
  +config ZEROPLUS_FF
  +     bool "Zeroplus based game controller force feedback support"
  +     depends on HID_ZEROPLUS
  +     select INPUT_FF_MEMLESS
  +     ---help---
  +       Say Y here if you have a Zeroplus based game controller and want
  +       to have force feedback support for it.
  +
   endmenu
   
   endif # HID_SUPPORT

diff --cc drivers/hid/Makefile
index 9b9271d6527a64d5b0f1d2ad43c4b38f8453948c,db35151673b17f25f453bb7cf2b7018eb580b4dd,cf3687d1ed6390a5406b1d8fe49cd1b1e2076def..0de2dff5542c9c59255f546fa8b2b512d9312c9e
--- 1/drivers/hid/Makefile
--- 2/drivers/hid/Makefile
--- 3/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@@ -34,15 -34,14 -37,12 +37,15 @@@@ obj-$(CONFIG_HID_NTRIG)           += hid-ntrig.
   obj-$(CONFIG_HID_PANTHERLORD)        += hid-pl.o
   obj-$(CONFIG_HID_PETALYNX)   += hid-petalynx.o
   obj-$(CONFIG_HID_SAMSUNG)    += hid-samsung.o
  +obj-$(CONFIG_HID_SMARTJOYPLUS)       += hid-sjoy.o
   obj-$(CONFIG_HID_SONY)               += hid-sony.o
   obj-$(CONFIG_HID_SUNPLUS)    += hid-sunplus.o
  -obj-$(CONFIG_GREENASIA_FF)   += hid-gaff.o
  -obj-$(CONFIG_THRUSTMASTER_FF)        += hid-tmff.o
  +obj-$(CONFIG_HID_GREENASIA)  += hid-gaff.o
  +obj-$(CONFIG_HID_THRUSTMASTER)       += hid-tmff.o
   obj-$(CONFIG_HID_TOPSEED)    += hid-topseed.o
  -obj-$(CONFIG_ZEROPLUS_FF)    += hid-zpff.o
 ++obj-$(CONFIG_HID_TWINHAN)    += hid-twinhan.o
  +obj-$(CONFIG_HID_ZEROPLUS)   += hid-zpff.o
  +obj-$(CONFIG_HID_WACOM)              += hid-wacom.o
   
   obj-$(CONFIG_USB_HID)                += usbhid/
   obj-$(CONFIG_USB_MOUSE)              += usbhid/

diff --cc drivers/hid/hid-core.c
index 48567d8fe3580bb82fd7f76b08e7cccc6f7d09cd,047844df992a91ac997bf092048e1a12ede9a40e,86c2ff2429d828db35df240329bcdfb7dc1331ee..342b7d36d7bbb91d57f33d04f7c00f61dca2ca0b
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
--- 3/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@@ -1075,9 -1075,9 -1072,10 +1072,10 @@@@ EXPORT_SYMBOL_GPL(hid_report_raw_event)
    */
   int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int interrupt)
   {
  -     struct hid_report_enum *report_enum = hid->report_enum + type;
  -     struct hid_driver *hdrv = hid->driver;
  +     struct hid_report_enum *report_enum;
  +     struct hid_driver *hdrv;
        struct hid_report *report;
++      char *buf;
        unsigned int i;
        int ret;
   
@@@@ -1091,18 -1091,18 -1087,38 +1089,38 @@@@
                return -1;
        }
   
--      dbg_hid("report (size %u) (%snumbered)\n", size, report_enum->numbered ? "" : "un");
++      buf = kmalloc(sizeof(char) * HID_DEBUG_BUFSIZE,
++                      interrupt ? GFP_ATOMIC : GFP_KERNEL);
++ 
++      if (!buf) {
++              report = hid_get_report(report_enum, data);
++              goto nomem;
++      }
++ 
++      snprintf(buf, HID_DEBUG_BUFSIZE - 1,
++                      "\nreport (size %u) (%snumbered)\n", size, report_enum->numbered ? "" : "un");
++      hid_debug_event(hid, buf);
   
        report = hid_get_report(report_enum, data);
--      if (!report)
++      if (!report) {
++              kfree(buf);
                return -1;
++      }
   
        /* dump the report */
--      dbg_hid("report %d (size %u) = ", report->id, size);
--      for (i = 0; i < size; i++)
--              dbg_hid_line(" %02x", data[i]);
--      dbg_hid_line("\n");
++      snprintf(buf, HID_DEBUG_BUFSIZE - 1,
++                      "report %d (size %u) = ", report->id, size);
++      hid_debug_event(hid, buf);
++      for (i = 0; i < size; i++) {
++              snprintf(buf, HID_DEBUG_BUFSIZE - 1,
++                              " %02x", data[i]);
++              hid_debug_event(hid, buf);
++      }
++      hid_debug_event(hid, "\n");
 + 
++      kfree(buf);
+  
++ nomem:
        if (hdrv && hdrv->raw_event && hid_match_report(hid, report)) {
                ret = hdrv->raw_event(hid, report, data, size);
                if (ret != 0)
@@@@ -1317,9 -1314,8 -1330,6 +1335,9 @@@@ static const struct hid_device_id hid_b
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651) },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },
        { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },
 ++     { HID_USB_DEVICE(USB_VENDOR_ID_TWINHAN, USB_DEVICE_ID_TWINHAN_IR_REMOTE) },
  +     { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },
  +     { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },
   

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

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

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