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

2013-03-13 Thread Tejun Heo
Hello, Andrew. On Wed, Mar 13, 2013 at 12:46:24PM -0700, Andrew Morton wrote: > 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 { > i

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

2013-03-13 Thread Andrew Morton
On Wed, 13 Mar 2013 15:49:05 +1100 Stephen Rothwell 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