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 tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
diff --cc kernel/workqueue.c
index c60de8e,34b139a..0000000
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@@ -2038,9 -2033,12 +2039,12 @@@ static bool maybe_destroy_workers(struc
* spin_lock_irq(pool->lock) which may be released and regrabbed
* multiple times. Does GFP_KERNEL allocations.
*
- * RETURNS:
+ * Return:
- * spin_lock_irq(pool->lock) which may be released and regrabbed
- * multiple times. Does GFP_KERNEL allocations.
+ * %false if the pool don't need management and the caller can safely start
+ * processing works, %true indicates that the function released pool->lock
+ * and reacquired it to perform some management function and that the
+ * conditions that the caller verified while holding the lock before
+ * calling the function might no longer be true.
*/
static bool manage_workers(struct worker *worker)
{
pgpWzpA26enlE.pgp
Description: PGP signature
