On Wed, Nov 26 2008, Ingo Molnar wrote: > > * Jens Axboe <jens.axboe@xxxxxxxxxx> wrote: > > > > the other direction (you merging ftrace bits) doesnt look too hot, > > > you'd have to pick up: > > > > > > 95 files changed, 5308 insertions(+), 1603 deletions(-) > > > > Lets do that, it's just a single patch here from Arnaldo. I have > > attached it to this email. > > thanks, here's the conversion to tracepoints below. Stephen, you might > want to pick up the blk tree straight away plus the fix below. I already pruned the patch from for-next and updated it, so you should not have any conflicts with or without this being merged. -- Jens Axboe -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html