From: Matt Mackall <mpm@selenic.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Pekka Enberg" <penberg@cs.helsinki.fi>,
"Christoph Lameter" <cl@linux-foundation.org>,
linux-next@vger.kernel.org,
"\"Américo Wang\"" <xiyou.wangcong@gmail.com>,
"Eduard - Gabriel Munteanu" <eduard.munteanu@linux360.ro>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Ingo Molnar" <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>
Subject: Re: linux-next: manual merge of the slab tree with the ftrace tree
Date: Tue, 20 Jan 2009 00:01:44 -0600 [thread overview]
Message-ID: <1232431304.5202.126.camel@calx> (raw)
In-Reply-To: <20090120145759.e707b9de.sfr@canb.auug.org.au>
On Tue, 2009-01-20 at 14:57 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the slab tree got a conflict in mm/slob.c
> between commit 3eae2cb24a96509e0a38cc48dc1538a2826f4e33 ("kmemtrace: SLOB
> hooks") from the ftrace tree and commit
> 6e9ed0cc4b963fde66ab47d9fb19147631e44555 ("slob: clean up the code") from
> the slab tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks good, thanks Stephen.
--
http://selenic.com : development and support for Mercurial and Linux
next prev parent reply other threads:[~2009-01-20 6:02 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-20 3:57 linux-next: manual merge of the slab tree with the ftrace tree Stephen Rothwell
2009-01-20 6:01 ` Matt Mackall [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-02-20 5:57 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
2009-02-20 22:58 ` Stephen Rothwell
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=1232431304.5202.126.camel@calx \
--to=mpm@selenic.com \
--cc=cl@linux-foundation.org \
--cc=eduard.munteanu@linux360.ro \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=penberg@cs.helsinki.fi \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--cc=xiyou.wangcong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).