From: Linus Torvalds Date: Thu, 20 May 2010 16:03:02 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq X-Git-Tag: firefly_0821_release~9833^2~2099 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fa5312d9e87e7222c6c384c4e930dc149bc1178d;p=firefly-linux-kernel-4.4.55.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: change cancel_work_sync() to clear work->data workqueue: warn about flush_scheduled_work() --- fa5312d9e87e7222c6c384c4e930dc149bc1178d