From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Oct 2010 00:13:10 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=91b745016c12d440386c40fb76ab69c8e08cbc06;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-linus' of git://git./linux/kernel/git/tj/wq

* '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
---

91b745016c12d440386c40fb76ab69c8e08cbc06
diff --cc fs/gfs2/main.c
index d7eb1e209aa8,1c5f46075d52..ebef7ab6e17e
--- a/fs/gfs2/main.c
+++ b/fs/gfs2/main.c
@@@ -144,7 -140,7 +144,7 @@@ static int __init init_gfs2_fs(void
  
  	error = -ENOMEM;
  	gfs_recovery_wq = alloc_workqueue("gfs_recovery",
- 					  WQ_RESCUER | WQ_FREEZEABLE, 0);
 -					  WQ_NON_REENTRANT | WQ_MEM_RECLAIM, 0);
++					  WQ_MEM_RECLAIM | WQ_FREEZEABLE, 0);
  	if (!gfs_recovery_wq)
  		goto fail_wq;