From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Vegard Nossum <vegard.nossum@gmail•com>,
Pekka Enberg <penberg@cs•helsinki.fi>,
Ingo Molnar <mingo@elte•hu>
Cc: linux-next@vger•kernel.org
Subject: linux-next: manual merge of the kmemcheck tree
Date: Tue, 28 Oct 2008 16:14:24 +1100 [thread overview]
Message-ID: <20081028161424.ce67a349.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the kmemcheck tree got a conflict in
arch/x86/mm/Makefile between commit
fd3fdf11d3c649769e02459c5f1b8081a15e9007 ("trace: add the MMIO-tracer to
the tracer menu, cleanup") from the ftrace tree and commit
385e31b9eae0528bada07d16a189f3f40df23961 ("kmemcheck: add the kmemcheck
core") from the kmemcheck tree.
Just context changes. I fixed it (see below) and can carry the fix.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc arch/x86/mm/Makefile
index 0a21b7a,f4edb6e..0000000
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@@ -8,8 -8,11 +8,10 @@@ obj-$(CONFIG_X86_PTDUMP) += dump_pageta
obj-$(CONFIG_HIGHMEM) += highmem_32.o
+ obj-$(CONFIG_KMEMCHECK) += kmemcheck/
+
-obj-$(CONFIG_MMIOTRACE_HOOKS) += kmmio.o
obj-$(CONFIG_MMIOTRACE) += mmiotrace.o
-mmiotrace-y := pf_in.o mmio-mod.o
+mmiotrace-y := kmmio.o pf_in.o mmio-mod.o
obj-$(CONFIG_MMIOTRACE_TEST) += testmmiotrace.o
obj-$(CONFIG_NUMA) += numa_$(BITS).o
next reply other threads:[~2008-10-28 5:14 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-28 5:14 Stephen Rothwell [this message]
2008-10-28 8:15 ` linux-next: manual merge of the kmemcheck tree Ingo Molnar
-- strict thread matches above, loose matches on Subject: below --
2008-12-30 12:18 Stephen Rothwell
2008-12-30 12:14 Stephen Rothwell
2008-10-21 5:29 Stephen Rothwell
2008-10-21 7:32 ` Ingo Molnar
2008-10-21 8:07 ` Vegard Nossum
2008-10-21 8:28 ` Ingo Molnar
2008-10-21 5:15 Stephen Rothwell
2008-08-20 6:40 Stephen Rothwell
[not found] <20080815164909.3d8beb10.sfr@canb.auug.org.au>
2008-08-15 7:04 ` Vegard Nossum
2008-08-15 8:00 ` Stephen Rothwell
2008-08-15 6:45 Stephen Rothwell
2008-08-15 6:43 ` Pekka Enberg
2008-08-15 8:17 ` Ingo Molnar
2008-08-13 5:29 Stephen Rothwell
2008-08-13 7:32 ` Ingo Molnar
2008-08-13 7:31 ` Pekka Enberg
2008-08-13 7:58 ` Ingo Molnar
2008-08-13 8:14 ` Pekka Enberg
2008-08-13 8:58 ` Ingo Molnar
2008-08-13 11:37 ` Pekka Enberg
2008-08-13 11:52 ` Ingo Molnar
2008-08-13 11:57 ` Pekka Enberg
2008-08-13 12:05 ` Ingo Molnar
2008-08-13 7:41 ` Stephen Rothwell
2008-08-13 5:26 Stephen Rothwell
2008-08-13 5:22 Stephen Rothwell
2008-07-28 4:09 Stephen Rothwell
2008-07-28 9:06 ` Ingo Molnar
2008-07-28 17:19 ` Stephen Rothwell
2008-07-28 4:01 Stephen Rothwell
2008-07-28 9:05 ` Ingo Molnar
2008-07-28 9:17 ` Vegard Nossum
2008-07-28 9:29 ` Ingo Molnar
2008-07-22 6:16 Stephen Rothwell
2008-07-22 6:52 ` Ingo Molnar
2008-07-22 8:18 ` Stephen Rothwell
2008-07-21 6:47 Stephen Rothwell
2008-07-11 6:32 Stephen Rothwell
2008-07-03 6:19 Stephen Rothwell
2008-07-03 6:12 Stephen Rothwell
2008-07-03 6:26 ` Ingo Molnar
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=20081028161424.ce67a349.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=penberg@cs$(echo .)helsinki.fi \
--cc=vegard.nossum@gmail$(echo .)com \
/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