From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alasdair G Kergon Subject: Re: linux-next: import of the device-mapper series failed Date: Mon, 1 Oct 2012 13:45:08 +0100 Message-ID: <20121001124508.GA5014@agk-dp.fab.redhat.com> References: <20121001132246.85b1943b16ec7a671fdd1ff6@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mx1.redhat.com ([209.132.183.28]:64360 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750929Ab2JAMpN (ORCPT ); Mon, 1 Oct 2012 08:45:13 -0400 Content-Disposition: inline In-Reply-To: <20121001132246.85b1943b16ec7a671fdd1ff6@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Alasdair G Kergon , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org On Mon, Oct 01, 2012 at 01:22:46PM +1000, Stephen Rothwell wrote: > Trying to import the device-mapper series produce this error: > $ git am ../quilt/device-mapper/dm-thin-support-discard-with-non-power-of-two-block-size.patch > Applying: Support discards when the pool's block size is not a power of 2. > error: patch failed: drivers/md/dm-thin.c:2762 > error: drivers/md/dm-thin.c: patch does not apply > and indeed the code in question is very different from what the patch > expects. Is there a missing patch? NEXT_BASE is lagging behind BASE: I removed the fixes that already went upstream - but should probably have waited until NEXT_BASE had picked them up. Alasdair