From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/md/dm-io.c | 17 ----------------- fs/bio.c | 5 ----- 2 files changed, 22 deletions(-) diff -puN fs/bio.c~git-block-fixup fs/bio.c --- a/fs/bio.c~git-block-fixup +++ a/fs/bio.c @@ -1193,12 +1193,7 @@ static void __init biovec_init_slabs(voi static int __init init_bio(void) { -<<<<<<< HEAD/fs/bio.c bio_slab = KMEM_CACHE(bio, SLAB_HWCACHE_ALIGN|SLAB_PANIC); -======= - bio_slab = kmem_cache_create("bio", sizeof(struct bio), 0, - SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); ->>>>>>> /fs/bio.c biovec_init_slabs(); diff -puN drivers/md/dm-io.c~git-block-fixup drivers/md/dm-io.c --- a/drivers/md/dm-io.c~git-block-fixup +++ a/drivers/md/dm-io.c @@ -55,26 +55,9 @@ struct dm_io_client *dm_io_client_create if (!client->pool) goto bad; -<<<<<<< HEAD/drivers/md/dm-io.c client->bios = bioset_create(16, 16); if (!client->bios) goto bad; -======= - } else { - /* create new pool */ - _io_pool = mempool_create_kmalloc_pool(new_ios, - sizeof(struct io)); - if (!_io_pool) - return -ENOMEM; - - _bios = bioset_create(16, 16); - if (!_bios) { - mempool_destroy(_io_pool); - _io_pool = NULL; - return -ENOMEM; - } - } ->>>>>>> /drivers/md/dm-io.c return client; _