linux-sg2042/drivers/hid
Linus Torvalds 033d9959ed Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue changes from Tejun Heo:
 "This is workqueue updates for v3.7-rc1.  A lot of activities this
  round including considerable API and behavior cleanups.

   * delayed_work combines a timer and a work item.  The handling of the
     timer part has always been a bit clunky leading to confusing
     cancelation API with weird corner-case behaviors.  delayed_work is
     updated to use new IRQ safe timer and cancelation now works as
     expected.

   * Another deficiency of delayed_work was lack of the counterpart of
     mod_timer() which led to cancel+queue combinations or open-coded
     timer+work usages.  mod_delayed_work[_on]() are added.

     These two delayed_work changes make delayed_work provide interface
     and behave like timer which is executed with process context.

   * A work item could be executed concurrently on multiple CPUs, which
     is rather unintuitive and made flush_work() behavior confusing and
     half-broken under certain circumstances.  This problem doesn't
     exist for non-reentrant workqueues.  While non-reentrancy check
     isn't free, the overhead is incurred only when a work item bounces
     across different CPUs and even in simulated pathological scenario
     the overhead isn't too high.

     All workqueues are made non-reentrant.  This removes the
     distinction between flush_[delayed_]work() and
     flush_[delayed_]_work_sync().  The former is now as strong as the
     latter and the specified work item is guaranteed to have finished
     execution of any previous queueing on return.

   * In addition to the various bug fixes, Lai redid and simplified CPU
     hotplug handling significantly.

   * Joonsoo introduced system_highpri_wq and used it during CPU
     hotplug.

  There are two merge commits - one to pull in IRQ safe timer from
  tip/timers/core and the other to pull in CPU hotplug fixes from
  wq/for-3.6-fixes as Lai's hotplug restructuring depended on them."

Fixed a number of trivial conflicts, but the more interesting conflicts
were silent ones where the deprecated interfaces had been used by new
code in the merge window, and thus didn't cause any real data conflicts.

Tejun pointed out a few of them, I fixed a couple more.

* 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (46 commits)
  workqueue: remove spurious WARN_ON_ONCE(in_irq()) from try_to_grab_pending()
  workqueue: use cwq_set_max_active() helper for workqueue_set_max_active()
  workqueue: introduce cwq_set_max_active() helper for thaw_workqueues()
  workqueue: remove @delayed from cwq_dec_nr_in_flight()
  workqueue: fix possible stall on try_to_grab_pending() of a delayed work item
  workqueue: use hotcpu_notifier() for workqueue_cpu_down_callback()
  workqueue: use __cpuinit instead of __devinit for cpu callbacks
  workqueue: rename manager_mutex to assoc_mutex
  workqueue: WORKER_REBIND is no longer necessary for idle rebinding
  workqueue: WORKER_REBIND is no longer necessary for busy rebinding
  workqueue: reimplement idle worker rebinding
  workqueue: deprecate __cancel_delayed_work()
  workqueue: reimplement cancel_delayed_work() using try_to_grab_pending()
  workqueue: use mod_delayed_work() instead of __cancel + queue
  workqueue: use irqsafe timer for delayed_work
  workqueue: clean up delayed_work initializers and add missing one
  workqueue: make deferrable delayed_work initializer names consistent
  workqueue: cosmetic whitespace updates for macro definitions
  workqueue: deprecate system_nrt[_freezable]_wq
  workqueue: deprecate flush[_delayed]_work_sync()
  ...
2012-10-02 09:54:49 -07:00
..
usbhid Merge branch 'upstream' into for-linus 2012-10-01 14:37:51 +02:00
Kconfig Staging tree update for 3.7-rc1 2012-10-01 12:11:39 -07:00
Makefile Staging tree update for 3.7-rc1 2012-10-01 12:11:39 -07:00
hid-a4tech.c HID: remove Paul Walmsley's copyright from places where it shouldn't be 2012-09-05 10:46:36 +02:00
hid-apple.c HID: remove Paul Walmsley's copyright from places where it shouldn't be 2012-09-05 10:46:36 +02:00
hid-aureal.c HID: remove Paul Walmsley's copyright from places where it shouldn't be 2012-09-05 10:46:36 +02:00
hid-axff.c hid: Add module.h to fix up implicit users of it 2011-10-31 19:31:17 -04:00
hid-belkin.c HID: remove Paul Walmsley's copyright from places where it shouldn't be 2012-09-05 10:46:36 +02:00
hid-cherry.c HID: remove Paul Walmsley's copyright from places where it shouldn't be 2012-09-05 10:46:36 +02:00
hid-chicony.c HID: add ASUS AIO keyboard model AK1D 2012-07-23 12:10:21 +02:00
hid-core.c Staging tree update for 3.7-rc1 2012-10-01 12:11:39 -07:00
hid-cypress.c HID: remove Paul Walmsley's copyright from places where it shouldn't be 2012-09-05 10:46:36 +02:00
hid-debug.c HID: hid-debug: Show rdesc for unclaimed devices 2012-08-27 08:01:21 -07:00
hid-dr.c hid: Add module.h to fix up implicit users of it 2011-10-31 19:31:17 -04:00
hid-elecom.c HID: Add and use hid_<level>: dev_<level> equivalents 2010-12-10 15:10:38 +01:00
hid-emsff.c Merge branches 'hyperv', 'multitouch', 'roccat', 'upstream', 'upstream-fixes', 'wacom' and 'wiimote' into for-linus 2012-01-05 15:51:02 +01:00
hid-ezkey.c HID: remove Paul Walmsley's copyright from places where it shouldn't be 2012-09-05 10:46:36 +02:00
hid-gaff.c hid: Add module.h to fix up implicit users of it 2011-10-31 19:31:17 -04:00
hid-generic.c HID: Create a common generic driver 2012-05-01 12:54:55 +02:00
hid-gyration.c HID: remove Paul Walmsley's copyright from places where it shouldn't be 2012-09-05 10:46:36 +02:00
hid-holtek-kbd.c HID: Add driver for Holtek based keyboards with broken HID 2012-07-12 12:34:43 +02:00
hid-holtekff.c HID: holtekff: use %*ph to dump small buffers 2012-09-10 23:00:32 +02:00
hid-hyperv.c HID: hyperv: Set the hid drvdata correctly 2012-05-17 10:01:07 +02:00
hid-ids.h Staging tree update for 3.7-rc1 2012-10-01 12:11:39 -07:00
hid-input.c HID: Add an input configured notification callback 2012-09-19 19:50:20 +02:00
hid-kensington.c HID: adding __init/__exit macros to module init/exit functions 2009-07-23 01:28:01 +02:00
hid-keytouch.c HID: add support for Keytouch IEC 60945 2011-02-17 15:12:45 +01:00
hid-kye.c HID: kye: Add support for 3 tablets 2012-02-28 13:37:12 +01:00
hid-lcpower.c HID: hid-lcpower: Use HID_UP_LOGIVENDOR instead of hard coded 0x0ffbc0000 2012-09-05 11:55:35 +02:00
hid-lenovo-tpkbd.c Merge branch 'upstream' into for-linus 2012-10-01 14:37:51 +02:00
hid-lg.c Merge branch 'upstream' into for-linus 2012-10-01 14:37:51 +02:00
hid-lg.h HID: hid-lg4ff: Adjust X axis input value accordingly to selected range. 2012-09-25 15:41:02 +02:00
hid-lg2ff.c HID: Add and use hid_<level>: dev_<level> equivalents 2010-12-10 15:10:38 +01:00
hid-lg3ff.c HID: Add and use hid_<level>: dev_<level> equivalents 2010-12-10 15:10:38 +01:00
hid-lg4ff.c Merge branch 'upstream' into for-linus 2012-10-01 14:37:51 +02:00
hid-lgff.c HID: lg4ff - Move handling of Logitech wheels to lg4ff driver 2011-08-04 16:45:55 +02:00
hid-logitech-dj.c HID: Fix logitech-dj: missing Unifying device issue 2012-09-22 10:58:48 +02:00
hid-logitech-dj.h HID: Fix logitech-dj: missing Unifying device issue 2012-09-22 10:58:48 +02:00
hid-magicmouse.c Input: MT - Add flags to input_mt_init_slots() 2012-09-19 19:50:18 +02:00
hid-microsoft.c HID: remove Paul Walmsley's copyright from places where it shouldn't be 2012-09-05 10:46:36 +02:00
hid-monterey.c HID: remove Paul Walmsley's copyright from places where it shouldn't be 2012-09-05 10:46:36 +02:00
hid-multitouch.c Merge branch 'multitouch' into for-linus 2012-10-01 14:38:54 +02:00
hid-ntrig.c HID: ntrig: change default value of logical/physical width/height to 1 2012-09-25 15:20:07 +02:00
hid-ortek.c HID: add support for Skycable 0x3f07 wireless presenter 2011-03-21 16:12:23 +01:00
hid-petalynx.c HID: remove Paul Walmsley's copyright from places where it shouldn't be 2012-09-05 10:46:36 +02:00
hid-picolcd.h HID: picolcd: fix build error if !CONFIG_DEBUG_FS 2012-09-11 16:06:22 +02:00
hid-picolcd_backlight.c HID: picoLCD: Improve unplug handling 2012-08-15 10:13:26 +02:00
hid-picolcd_cir.c HID: picoLCD: fix a NULL test in picolcd_raw_cir() 2012-09-08 21:19:07 +02:00
hid-picolcd_core.c HID: picolcd_core: Remove setting hdev->claimed before calling hid_hw_start() 2012-09-19 13:57:03 +02:00
hid-picolcd_debugfs.c HID: picoLCD: optimize for inactive debugfs 2012-10-01 10:25:01 +02:00
hid-picolcd_fb.c Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2012-10-02 09:54:49 -07:00
hid-picolcd_lcd.c HID: picoLCD: Improve unplug handling 2012-08-15 10:13:26 +02:00
hid-picolcd_leds.c HID: picoLCD: Improve unplug handling 2012-08-15 10:13:26 +02:00
hid-pl.c misc latin1 to utf8 conversions 2012-01-02 13:04:55 +01:00
hid-primax.c HID: primax: Remove px_probe() and px_remove() functions 2012-09-07 14:55:38 +02:00
hid-prodikeys.c HID: prodikeys: Remove unnecessary casts of void pointers 2012-09-17 13:08:30 +02:00
hid-ps3remote.c HID: Add support for Sony PS3 BD Remote Control 2012-10-01 10:11:48 +02:00
hid-roccat-arvo.c HID: roccat: rename roccat_common functions to roccat_common2 2012-06-28 10:34:01 +02:00
hid-roccat-arvo.h HID: roccat: correction and cleanup of HID feature reports 2011-06-13 12:52:57 +02:00
hid-roccat-common.c HID: roccat: rename roccat_common functions to roccat_common2 2012-06-28 10:34:01 +02:00
hid-roccat-common.h HID: roccat: rename roccat_common functions to roccat_common2 2012-06-28 10:34:01 +02:00
hid-roccat-isku.c HID: roccat: rename roccat_common functions to roccat_common2 2012-06-28 10:34:01 +02:00
hid-roccat-isku.h HID: roccat: move functionality to roccat-common 2012-06-28 10:34:01 +02:00
hid-roccat-kone.c HID: roccat: fix wrong hid_err usage on struct usb_device 2012-06-28 10:34:01 +02:00
hid-roccat-kone.h HID: roccat: correction and cleanup of HID feature reports 2011-06-13 12:52:57 +02:00
hid-roccat-koneplus.c HID: roccat: rename roccat_common functions to roccat_common2 2012-06-28 10:34:01 +02:00
hid-roccat-koneplus.h HID: roccat: move functionality to roccat-common 2012-06-28 10:34:01 +02:00
hid-roccat-kovaplus.c HID: roccat: rename roccat_common functions to roccat_common2 2012-06-28 10:34:01 +02:00
hid-roccat-kovaplus.h HID: roccat: move functionality to roccat-common 2012-06-28 10:34:01 +02:00
hid-roccat-pyra.c HID: roccat: rename roccat_common functions to roccat_common2 2012-06-28 10:34:01 +02:00
hid-roccat-pyra.h HID: roccat: move functionality to roccat-common 2012-06-28 10:34:01 +02:00
hid-roccat-savu.c HID: roccat: added sensor sysfs attribute for Savu 2012-07-20 09:50:42 +02:00
hid-roccat-savu.h HID: roccat: added sensor sysfs attribute for Savu 2012-07-20 09:50:42 +02:00
hid-roccat.c Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
hid-saitek.c HID: add new driver for non-compliant Saitek devices 2012-02-22 11:30:17 +01:00
hid-samsung.c HID: remove Paul Walmsley's copyright from places where it shouldn't be 2012-09-05 10:46:36 +02:00
hid-sensor-hub.c HID: hid-sensor-hub: Fix sensor_hub_probe error handling 2012-09-22 10:33:14 +01:00
hid-sjoy.c HID: sjoy: Add device ID for Super Joy Box 3 2012-02-21 14:16:36 +01:00
hid-sony.c HID: remove Paul Walmsley's copyright from places where it shouldn't be 2012-09-05 10:46:36 +02:00
hid-speedlink.c HID: Add driver to fix Speedlink VAD Cezanne support 2011-06-08 09:45:37 +02:00
hid-sunplus.c HID: remove Paul Walmsley's copyright from places where it shouldn't be 2012-09-05 10:46:36 +02:00
hid-tivo.c HID: tivo: fix support for bluetooth version of tivo Slide 2012-03-30 15:28:59 +02:00
hid-tmff.c hid: Add module.h to fix up implicit users of it 2011-10-31 19:31:17 -04:00
hid-topseed.c HID: Add support for Perixx PERIBOARD-707 (Plus) 2010-11-25 15:59:02 +01:00
hid-twinhan.c misc latin1 to utf8 conversions 2012-01-02 13:04:55 +01:00
hid-uclogic.c HID: uclogic: Add support for UC-Logic TWHA60 2012-08-27 08:09:21 -07:00
hid-wacom.c Merge branch 'upstream' into for-linus 2012-10-01 14:37:51 +02:00
hid-waltop.c HID: waltop: Remove waltop_probe() and waltop_remove() functions 2012-09-07 14:53:59 +02:00
hid-wiimote-core.c HID: wiimote: Fix IR data parser 2012-05-09 11:40:51 +02:00
hid-wiimote-debug.c simple_open: automatically convert to simple_open() 2012-04-05 15:25:50 -07:00
hid-wiimote-ext.c Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2012-10-02 09:54:49 -07:00
hid-wiimote.h HID: wiimote: Allow direct DRM debug access 2011-11-22 23:11:10 +01:00
hid-zpff.c hid: Add module.h to fix up implicit users of it 2011-10-31 19:31:17 -04:00
hid-zydacron.c HID: zydacron: kfree() NULL pointer cleanup 2011-08-04 23:51:29 +02:00
hidraw.c Merge branch 'upstream' into for-linus 2012-10-01 14:37:51 +02:00
uhid.c HID: uhid: Fix sending events with invalid data 2012-07-20 09:53:45 +02:00