Skip to contentSkip to conversation

workqueue changes for 2.6.34-rc1

GIT PULL Tejun Heo 1 participant 2 messages Mar 3, 2010 – Mar 8, 2010

lore
Share & tools
lore

Tejun Heo

author
#0 lore raw

Hello, Linus.

Please pull from the following workqueue branch.

git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git for-linus

As cmwq still is going through reviews, the branch contains only two minor changes - one to beef up comment, the other to make flush_workqueue() return when sure deadlock can be predicted.

Merging into 3a5b27bf6f29574d667230c7e76e4b83fe3014e0 doesn't cause any conflict.

Thanks.

==================
Summary of changes
==================

Alan Stern (1):
workqueue: warn about flush_scheduled_work()

Simon Kagstrom (1):
workqueue: return on workqueue recursion

 kernel/workqueue.c |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

--
tejun

author
#1 lore raw
Quoted 3 lines · Tejun Heo

Please pull from the following workqueue branch.

git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git for-linus

Ping. Thanks.

Signature · 1 line
tejun