Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Nov 2017 20:26:49 +0000 (12:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Nov 2017 20:26:49 +0000 (12:26 -0800)
commite4880bc5dfb1f02b152e62a894b5c6f3e995b3cf
treed49f90a4fd53973af7609fcd0958bb7528cdf5bf
parent136fc5c41f349296db1910677bb7402b0eeff376
parentcef572ad9bd7f85035ba8272e5352040e8be0152
Merge branch 'for-4.14-fixes' of git://git./linux/kernel/git/tj/wq

Pull workqueue fix from Tejun Heo:
 "Another fix for a really old bug.

  It only affects drain_workqueue() which isn't used often and even then
  triggers only during a pretty small race window, so it isn't too
  surprising that it stayed hidden for so long.

  The fix is straight-forward and low-risk. Kudos to Li Bin for
  reporting and fixing the bug"

* 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: Fix NULL pointer dereference
kernel/workqueue_internal.h