Merge branch 'for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Sep 2017 04:59:31 +0000 (21:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Sep 2017 04:59:31 +0000 (21:59 -0700)
commit9954d4892a813155cf808b1c29df50886b5672cf
tree7988449c499804aab0550a4e7381b417dbc6980e
parenta7cbfd05f427f8f1164bc53866971e89a0cbe103
parentfbf1c41fc0f4d3574ac2377245efd666c1fa3075
Merge branch 'for-4.14' of git://git./linux/kernel/git/tj/wq

Pull workqueue updates from Tejun Heo:
 "Nothing major. I introduced a flag collsion bug during v4.13 cycle
  which is fixed in this pull request. Fortunately, the flag is for
  debugging / verification and the bug isn't critical"

* 'for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: Fix flag collision
  workqueue: Use TASK_IDLE
  workqueue: fix path to documentation
  workqueue: doc change for ST behavior on NUMA systems
kernel/workqueue.c