From: Pekka Enberg <penberg@cs•helsinki.fi>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Christoph Lameter <cl@linux-foundation•org>,
linux-next@vger•kernel.org,
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 ftace tree
Date: Mon, 26 Jan 2009 10:36:51 +0200 [thread overview]
Message-ID: <1232959011.21504.0.camel@penberg-laptop> (raw)
In-Reply-To: <20090126153131.8a6dcf9a.sfr@canb.auug.org.au>
Hi Stephen,
On Mon, 2009-01-26 at 15:31 +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the slab tree got conflicts in
> include/linux/slub_def.h and mm/slub.c between commit
> 5b882be4e00e53a44f47ad7eb997cac2938848bf ("kmemtrace: SLUB hooks") from
> the ftrace tree and commit 97a4871761e735b6f1acd3bc7c3bac30dae3eab9
> ("SLUB: revert direct page allocator pass through") from the slab tree.
>
> I fixed them up (see below, worth a check) and can carry the fix as
> necessary.
Yup, looks good to me. The kmalloc_large() function is dropped by the
page allocator pass-through revert in linux-next. Thanks!
Pekka
prev parent reply other threads:[~2009-01-26 8:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-26 4:31 linux-next: manual merge of the slab tree with the ftace tree Stephen Rothwell
2009-01-26 8:36 ` Pekka Enberg [this message]
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=1232959011.21504.0.camel@penberg-laptop \
--to=penberg@cs$(echo .)helsinki.fi \
--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=sfr@canb$(echo .)auug.org.au \
--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