Date: Mon, 1 Oct 2012 13:45:08 +0100
From: Alasdair G Kergon <agk@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Alasdair G Kergon <agk@redhat.com>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: linux-next: import of the device-mapper series failed
Message-ID: <20121001124508.GA5014@agk-dp.fab.redhat.com>
Mail-Followup-To: Alasdair G Kergon <agk@redhat.com>,
	Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org
References: <20121001132246.85b1943b16ec7a671fdd1ff6@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20121001132246.85b1943b16ec7a671fdd1ff6@canb.auug.org.au>
Organization: Red Hat UK Ltd. Registered in England and Wales, number
	03798903. Registered Office: 64 Baker Street, 4th floor, London,
	W1U 7DF.
User-Agent: Mutt/1.5.18 (2008-05-17)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 923
Lines: 19

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

--
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/