linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: import of the device-mapper series failed
@ 2012-10-01  3:22 Stephen Rothwell
  2012-10-01 12:45 ` Alasdair G Kergon
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-10-01  3:22 UTC (permalink / raw)
  To: Alasdair G Kergon; +Cc: linux-next, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 659 bytes --]

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                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: linux-next: import of the device-mapper series failed
  2012-10-01  3:22 linux-next: import of the device-mapper series failed Stephen Rothwell
@ 2012-10-01 12:45 ` Alasdair G Kergon
  0 siblings, 0 replies; 2+ messages in thread
From: Alasdair G Kergon @ 2012-10-01 12:45 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Alasdair G Kergon, linux-next, linux-kernel

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-10-01 12:45 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-01  3:22 linux-next: import of the device-mapper series failed Stephen Rothwell
2012-10-01 12:45 ` Alasdair G Kergon

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).