From: Linus Torvalds Date: Tue, 14 Mar 2017 21:52:08 +0000 (-0700) Subject: Merge branch 'for-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq X-Git-Tag: v5.15~11679 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc25887935dba31be8f253dd5129e5004a346d97;p=platform%2Fkernel%2Flinux-starfive.git Merge branch 'for-4.11-fixes' of git://git./linux/kernel/git/tj/wq Pull workqueue fix from Tejun Heo: "If a delayed work is queued with NULL @wq, workqueue code explodes after the timer expires at which point it's difficult to tell who the culprit was. This actually happened and the offender was net/smc this time. Add an explicit sanity check for it in the queueing path" * 'for-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: trigger WARN if queue_delayed_work() is called with NULL @wq --- bc25887935dba31be8f253dd5129e5004a346d97