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

From: Stephen Rothwell
Date: Fri Feb 15 2013 - 01:51:08 EST

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
kernel/workqueue.c between commit 8d03ecfe4718 ("workqueue: reimplement
is_chained_work() using current_wq_worker()") from the workqueues tree
and commit "hlist: drop the node parameter from iterators" from the akpm

I fixed it up (the former removes the code changed by the latter, so I
did that) and can carry the fix as necessary (no action is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature