yeah, merges should generally be done in the upstream repo. Obviously
git-request-pull must list all the commits that happened - it doesnt
know which commits are 'interesting' or not. I've done an upstream
merge.
btw., a small build fix (see below) was needed.
Ingo
---------------->
From 92a9abb2c571ab8fedaee3537c5667b4e61188ce Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 8 Sep 2008 16:50:43 +0200
Subject: [PATCH] kmemcheck: build fix
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
fix:
arch/x86/mm/kmemcheck/kmemcheck.c: In function ‘kmemcheck_init’:
arch/x86/mm/kmemcheck/kmemcheck.c:42: error: ‘setup_max_cpus’ undeclared (first use in this function)
arch/x86/mm/kmemcheck/kmemcheck.c:42: error: (Each undeclared identifier is reported only once
arch/x86/mm/kmemcheck/kmemcheck.c:42: error: for each function it appears in.)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/mm/kmemcheck/kmemcheck.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
index eef8c6a..75831f0 100644
--- a/arch/x86/mm/kmemcheck/kmemcheck.c
+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
@@ -35,6 +35,7 @@ void __init kmemcheck_init(void)
{
printk(KERN_INFO "kmemcheck: \"Bugs, beware!\"\n");
+#if defined(CONFIG_SMP) && !defined(CONFIG_KMEMCHECK_USE_SMP)
/*
* Limit SMP to use a single CPU. We rely on the fact that this code
* runs before SMP is set up.
@@ -44,6 +45,7 @@ void __init kmemcheck_init(void)
"kmemcheck: Limiting number of CPUs to 1.\n");
setup_max_cpus = 1;
}
+#endif
}
#ifdef CONFIG_KMEMCHECK_DISABLED_BY_DEFAULT
--
