On Fri, May 22 2009, Martin K. Petersen wrote: > >>>>> "Jens" == Jens Axboe <jens.axboe@xxxxxxxxxx> writes: > > Jens> I replaced the original patch and went to apply this, but it fails > Jens> even at the first patch. What is this against? If you want it > Jens> queued for 2.6.31, please post it against the for-2.6.31 branch of > Jens> the block repo. > > Weird. It was cut against your for-2.6.31 branch as of a few days ago. > I just updated to your latest and greatest and the patches still apply > cleanly for me. That is weird... > Are you sure you got the patch order right? Using git am, it seems to pick them up in the right order: axboe@carl:~/git/linux-2.6-block$ git am -s mkp Applying: block: Do away with the notion of hardsect_size Applying: block: Use accessor functions for queue limits error: patch failed: block/blk-map.c:291 error: block/blk-map.c: patch does not apply Patch failed at 0002 block: Use accessor functions for queue limits When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". My for-2.6.31 branch is at b9ed7252d219c1c663944bf03846eabb515dbe75 -- Jens Axboe -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
