2012-10-01 04:23:26

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: import of the device-mapper series failed

Hi Alasdair,

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?

I dropped that patch and the following
dm-thin-move-bio_prison-code-to-separate-module.patch that also did not
apply.

--
Cheers,
Stephen Rothwell [email protected]


Attachments:
(No filename) (640.00 B)
(No filename) (836.00 B)
Download all attachments

2012-10-01 12:45:16

by Alasdair G Kergon

[permalink] [raw]
Subject: Re: linux-next: import of the device-mapper series failed

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