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
tree.
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).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpp54t7ux_dU.pgp
Description: PGP signature
