Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753127Ab0GFOaU (ORCPT ); Tue, 6 Jul 2010 10:30:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48457 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752052Ab0GFOaS (ORCPT ); Tue, 6 Jul 2010 10:30:18 -0400 Date: Tue, 6 Jul 2010 10:30:06 -0400 From: Mike Snitzer To: Stephen Rothwell Cc: Alasdair G Kergon , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, FUJITA Tomonori , Jens Axboe Subject: Re: linux-next: manual merge of the device-mapper tree with the block tree Message-ID: <20100706143006.GA16626@redhat.com> References: <20100706143313.1d4e2909.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100706143313.1d4e2909.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.20 (2009-08-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 977 Lines: 27 On Tue, Jul 06 2010 at 12:33am -0400, Stephen Rothwell wrote: > Hi Alasdair, > > Today's linux-next merge of the device-mapper tree got a conflict in > drivers/md/dm.c between commits 9add80db6089272d6bf13ef6b5dc7b3ddda1a887 > ("dm: stop using q->prepare_flush_fn") and > 5e27e27e73b5bff903b3c30ffd5a0e17eb95c087 ("block: remove > q->prepare_flush_fn completely") from the block tree and commit > 90c50ea6a71bcb1bdf1482007932cc7fb0902455 > ("dm-do-not-initialise-full-request-queue-when-bio-based") from the > device-mapper tree. > > I fixed it up (see below) and can carry the fix as necessary. Hi Stephen, Your fix is correct, thanks for carrying this until Alasdair gets a chance to pick it up. Mike -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/