From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ingo Molnar <mingo@elte•hu>
Cc: Pekka Enberg <penberg@cs•helsinki.fi>,
Christoph Lameter <cl@linux-foundation•org>,
linux-next@vger•kernel.org,
Eduard - Gabriel Munteanu <eduard.munteanu@linux360•ro>,
Thomas Gleixner <tglx@linutronix•de>,
"H. Peter Anvin" <hpa@zytor•com>
Subject: Re: linux-next: manual merge of the slab tree with the ftrace tree
Date: Sat, 21 Feb 2009 10:07:31 +1100 [thread overview]
Message-ID: <20090221100731.c2af97b0.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20090220111651.GJ28581@elte.hu>
[-- Attachment #1: Type: text/plain, Size: 793 bytes --]
On Fri, 20 Feb 2009 12:16:51 +0100 Ingo Molnar <mingo@elte•hu> 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@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2009-02-20 23:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-20 5:57 linux-next: manual merge of the slab tree with the ftrace tree Stephen Rothwell
2009-02-20 8:25 ` Pekka Enberg
2009-02-20 8:59 ` Stephen Rothwell
2009-02-20 9:37 ` Ingo Molnar
2009-02-20 9:41 ` Pekka Enberg
2009-02-20 9:53 ` Ingo Molnar
2009-02-20 11:12 ` Pekka Enberg
2009-02-20 11:16 ` Ingo Molnar
2009-02-20 23:07 ` Stephen Rothwell [this message]
2009-02-20 22:58 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2009-01-20 3:57 Stephen Rothwell
2009-01-20 6:01 ` Matt Mackall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090221100731.c2af97b0.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cl@linux-foundation$(echo .)org \
--cc=eduard.munteanu@linux360$(echo .)ro \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=penberg@cs$(echo .)helsinki.fi \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox