Re: linux-next: manual merge of the slab tree with the ftrace tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, 20 Feb 2009 12:16:51 +0100 Ingo Molnar <mingo@xxxxxxx> wrote:
>
> > Aye, aye, cap'n:
> > 
> >   git pull git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git for-ingo
> > 
> > the commit is here in case someone wants to take a look at it:
> > 
> > http://git.kernel.org/?p=linux/kernel/git/penberg/slab-2.6.git;a=commitdiff;h=fe1200b63d158b28eef6d4de1e5b5f99c681ba2f
> 
> Pulled into tip:tracing/kmemtrace, thanks Pekka!
> 
> Below is the conflict resolution i did. Will push out a new 
> tip:auto-ftrace-next tree once it got a bit of testing.

[I should read more of my mail before replying]

Thanks all - every little bit make my life easier.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgpOWYvwyOvZY.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux