From: Andrew Morton <akpm@linux-foundation•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Tejun Heo <tj@kernel•org>
Subject: Re: linux-next: manual merge of the akpm tree with the workqueues tree
Date: Wed, 13 Mar 2013 12:46:24 -0700 [thread overview]
Message-ID: <20130313124624.1d51184d95d2c69c37daad0d@linux-foundation.org> (raw)
In-Reply-To: <20130313154905.59d00adb5b62d5169649aea0@canb.auug.org.au>
On Wed, 13 Mar 2013 15:49:05 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Today's linux-next merge of the akpm tree got a conflict in
> kernel/workqueue.c between commit fa1b54e69bc6 ("workqueue: update
> synchronization rules on worker_pool_idr") from the workqueues tree and
> commit "workqueue: convert to idr_alloc()" from the akpm tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary
> (no action is required).
>
OK, thanks. I have workqueue-convert-to-idr_alloc.patch queued for 3.9
so I moved it ahead of linux-next.patch and made a mess.
Tejun, can you please confirm that this is how worker_pool_assign_id()
should look in linux-next?
static int worker_pool_assign_id(struct worker_pool *pool)
{
int ret;
do {
idr_preload(GFP_KERNEL);
spin_lock_irq(&workqueue_lock);
ret = idr_alloc(&worker_pool_idr, pool, 0, 0, GFP_NOWAIT);
if (ret >= 0)
pool->id = ret;
spin_unlock_irq(&workqueue_lock);
} while (ret == -EAGAIN);
return ret < 0 ? ret : 0;
}
next prev parent reply other threads:[~2013-03-13 19:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-13 4:49 linux-next: manual merge of the akpm tree with the workqueues tree Stephen Rothwell
2013-03-13 19:46 ` Andrew Morton [this message]
2013-03-13 20:51 ` Tejun Heo
-- strict thread matches above, loose matches on Subject: below --
2013-02-15 6:50 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130313124624.1d51184d95d2c69c37daad0d@linux-foundation.org \
--to=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox