linux-next: manual merge of the workqueues tree with the trivial tree

Hi Tejun, Today's linux-next merge of the workqueues tree got a conflict in kernel/workqueue.c between commit d185af300fe4 ("workqueue: fix some scripts/kernel-doc warnings") from the trivial tree and commit 2d498db9814c ("workqueue: Fix manage_workers() RETURNS description") from the workqueues

linux-next: manual merge of the workqueues tree with the trivial tree

Hi Tejun, Today's linux-next merge of the workqueues tree got a conflict in kernel/workqueue.c between commit d185af300fe4 (workqueue: fix some scripts/kernel-doc warnings) from the trivial tree and commit 2d498db9814c (workqueue: Fix manage_workers() RETURNS description) from the workqueues