From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Catalin Marinas <catalin.marinas@arm.com>
Cc: linux-next@vger.kernel.org, Tejun Heo <tj@kernel.org>,
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 with the tip-core tree
Date: Fri, 6 Mar 2009 18:17:04 +1100 [thread overview]
Message-ID: <20090306181704.f78b2a32.sfr@canb.auug.org.au> (raw)
Hi Catalin,
Today's linux-next merge of the kmemleak tree got a conflict in
kernel/module.c between commit fbf59bc9d74d1fb30b8e0630743aff2806eafcea
("percpu: implement new dynamic percpu allocator") from the tip-core tree
and commit 6649b74fa7cb64421fce4f3cd4c40b3aa6f3208d ("kmemleak: Add
modules support") from the kmemleak tree.
Juts overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc kernel/module.c
index 6e7621d,92b60e7..0000000
--- a/kernel/module.c
+++ b/kernel/module.c
@@@ -51,7 -51,7 +51,8 @@@
#include <linux/tracepoint.h>
#include <linux/ftrace.h>
#include <linux/async.h>
+#include <linux/percpu.h>
+ #include <linux/kmemleak.h>
#if 0
#define DEBUGP printk
next reply other threads:[~2009-03-06 7:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-06 7:17 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-03-06 7:21 linux-next: manual merge of the kmemleak tree with the tip-core tree Stephen Rothwell
2009-03-06 7:19 Stephen Rothwell
2009-02-17 8:45 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=20090306181704.f78b2a32.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=catalin.marinas@arm.com \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
/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