• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 91b74501
    Linus Torvalds authored
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
      workqueue: remove in_workqueue_context()
      workqueue: Clarify that schedule_on_each_cpu is synchronous
      memory_hotplug: drop spurious calls to flush_scheduled_work()
      shpchp: update workqueue usage
      pciehp: update workqueue usage
      isdn/eicon: don't call flush_scheduled_work() from diva_os_remove_soft_isr()
      workqueue: add and use WQ_MEM_RECLAIM flag
      workqueue: fix HIGHPRI handling in keep_working()
      workqueue: add queue_work and activate_work trace points
      workqueue: prepare for more tracepoints
      workqueue: implement flush[_delayed]_work_sync()
      workqueue: factor out start_flush_work()
      workqueue: cleanup flush/cancel functions
      workqueue: implement alloc_ordered_workqueue()
    
    Fix up trivial conflict in fs/gfs2/main.c as per Tejun
    91b74501
main.c 4.97 KB