From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752595AbZIJEsI (ORCPT ); Thu, 10 Sep 2009 00:48:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751068AbZIJEsH (ORCPT ); Thu, 10 Sep 2009 00:48:07 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:55582 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750842AbZIJEsG (ORCPT ); Thu, 10 Sep 2009 00:48:06 -0400 Date: Thu, 10 Sep 2009 14:48:01 +1000 From: Stephen Rothwell To: Jens Axboe Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ed Cashin Subject: linux-next: manual merge of the block tree with the tree Message-Id: <20090910144801.2b604ee7.sfr@canb.auug.org.au> X-Mailer: Sylpheed 2.7.1 (GTK+ 2.16.6; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Jens, Today's linux-next merge of the block tree got a conflict in drivers/block/aoe/aoeblk.c between commit 7135a71b19be1faf48b7148d77844d03bc0717d6 ("aoe: allocate unused request_queue for sysfs") from Linus' tree and commit 5063fe01e7dc205ebca89877f8eb01d6a5b0ebd6 ("writeback: add name to backing_dev_info") from the block tree. I fixed it up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/block/aoe/aoeblk.c index 1e15889,0efb8fc..0000000 --- a/drivers/block/aoe/aoeblk.c +++ b/drivers/block/aoe/aoeblk.c @@@ -264,12 -264,10 +264,13 @@@ aoeblk_gdalloc(void *vp goto err_disk; } - blk_queue_make_request(&d->blkq, aoeblk_make_request); - d->blkq.backing_dev_info.name = "aoe"; - if (bdi_init(&d->blkq.backing_dev_info)) + d->blkq = blk_alloc_queue(GFP_KERNEL); + if (!d->blkq) goto err_mempool; + blk_queue_make_request(d->blkq, aoeblk_make_request); ++ d->blkq->backing_dev_info.name = "aoe"; + if (bdi_init(&d->blkq->backing_dev_info)) + goto err_blkq; spin_lock_irqsave(&d->lock, flags); gd->major = AOE_MAJOR; gd->first_minor = d->sysminor * AOE_PARTITIONS;