Merge branch 'for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Aug 2018 20:16:36 +0000 (13:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Aug 2018 20:16:36 +0000 (13:16 -0700)
commit9022ada8ab6f1f1a932a3c93815061042e6548a5
tree1d87519ea97b2939ec61d8d0f94c22b59d8c9c7b
parent18b8bfdfbae5821a7df691bc1e542bbab6c31e9c
parent87915adc3f0acdf03c776df42e308e5a155c19af
Merge branch 'for-4.19' of git://git./linux/kernel/git/tj/wq

Pull workqueue updates from Tejun Heo:
 "Over the lockdep cross-release churn, workqueue lost some of the
  existing annotations. Johannes Berg restored it and also improved
  them"

* 'for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: re-add lockdep dependencies for flushing
  workqueue: skip lockdep wq dependency in cancel_work_sync()
kernel/workqueue.c