From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Catalin Marinas <catalin.marinas@arm•com>
Cc: linux-next@vger•kernel.org,
Eduard - Gabriel Munteanu <eduard.munteanu@linux360•ro>,
Pekka Enberg <penberg@cs•helsinki.fi>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>
Subject: linux-next: manual merge of the kmemleak tree
Date: Thu, 15 Jan 2009 16:27:02 +1100 [thread overview]
Message-ID: <20090115162702.c395bcd2.sfr@canb.auug.org.au> (raw)
Hi Catalin,
Today's linux-next merge of the kmemleak tree got a conflict in
init/main.c between commit b9ce08c01020eb28bfbfa6faf1c740281c5f418e
("kmemtrace: Core implementation") from the ftrace tree and commit
faff141a1eb4e690c0c54ab8684f8b267bc116c5 ("kmemleak: Add the base
support") from the kmemleak tree.
Trivial overlapping additions. I fixed it up (see below) and can carry
the fix as necessary. The only doubt in my mind was the ordering of
these calls.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc init/main.c
index ff3d580,c7f81aa..0000000
--- a/init/main.c
+++ b/init/main.c
@@@ -650,7 -643,7 +652,8 @@@ asmlinkage void __init start_kernel(voi
enable_debug_pagealloc();
cpu_hotplug_init();
kmem_cache_init();
+ kmemtrace_init();
+ kmemleak_init();
debug_objects_mem_init();
idr_init_cache();
setup_per_cpu_pageset();
next reply other threads:[~2009-01-15 5:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-15 5:27 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-01-19 5:16 linux-next: manual merge of the kmemleak tree Stephen Rothwell
2009-01-15 5:27 Stephen Rothwell
2009-01-15 10:29 ` Eduard - Gabriel Munteanu
2009-01-15 10:38 ` Ingo Molnar
2009-01-15 12:04 ` Catalin Marinas
2009-01-15 12:27 ` Ingo Molnar
2009-01-15 17:49 ` Eduard - Gabriel Munteanu
2009-04-21 11:14 ` Catalin Marinas
2009-04-21 11:47 ` Catalin Marinas
2009-04-21 18:02 ` Pekka Enberg
2009-01-15 5:27 Stephen Rothwell
2009-01-15 5:27 Stephen Rothwell
2009-01-15 5:26 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=20090115162702.c395bcd2.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=catalin.marinas@arm$(echo .)com \
--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