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

[Stephen Rothwell]

Hi Tejun,

Today's linux-next merge of the workqueues tree got a conflict in
fs/aio.c between commit cf15900e1209 ("aio: remove request submission
batching") from the block tree and commit d37adaa15962 ("fs/aio: aio_wq
isn't used in memory reclaim path") from the workqueues tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc fs/aio.c
index a936b7f,8007bd6..0000000
--- a/fs/aio.c
+++ b/fs/aio.c
@@@ -75,8 -85,9 +75,8 @@@ static int __init aio_setup(void
  	kiocb_cachep = KMEM_CACHE(kiocb, SLAB_HWCACHE_ALIGN|SLAB_PANIC);
  	kioctx_cachep = KMEM_CACHE(kioctx,SLAB_HWCACHE_ALIGN|SLAB_PANIC);
  
- 	aio_wq = create_workqueue("aio");
+ 	aio_wq = alloc_workqueue("aio", 0, 1);	/* used to limit concurrency */
 -	abe_pool = mempool_create_kmalloc_pool(1, sizeof(struct aio_batch_entry));
 -	BUG_ON(!aio_wq || !abe_pool);
 +	BUG_ON(!aio_wq);
  
  	pr_debug("aio_setup: sizeof(struct page) = %d\n", (int)sizeof(struct page));
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/