* linux-next: manual merge of the workqueues tree with the trivial tree
@ 2013-08-22 5:07 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-08-22 5:07 UTC (permalink / raw)
To: Tejun Heo; +Cc: linux-next, linux-kernel, Yacine Belkadi, Jiri Kosina, Libin
[-- Attachment #1: Type: text/plain, Size: 1360 bytes --]
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 sfr@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)
{
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-08-22 5:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-22 5:07 linux-next: manual merge of the workqueues tree with the trivial tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).