From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Pekka Enberg <penberg@cs.helsinki.fi>,
Christoph Lameter <cl@linux-foundation.org>
Cc: linux-next@vger.kernel.org,
Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Subject: linux-next: manual merge of the slab tree
Date: Tue, 21 Oct 2008 15:55:10 +1100 [thread overview]
Message-ID: <20081021155510.64fcb2b6.sfr@canb.auug.org.au> (raw)
Hi Pekka, Christoph,
Today's linux-next merge of the slab tree got a trivial conflict in
mm/Makefile between commit 52d4b9ac0b985168009c2a57098324e67bae171f
("memcg: allocate all page_cgroup at boot") from Linus' tree and commit
16c47ef3e86307c58149f417a6fa4925b90c7e9f ("kmemtrace: Core
implementation") from the slab tree.
Just a context change. I fixed it up (see below).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc mm/Makefile
index c06b45a,7f42d55..0000000
--- a/mm/Makefile
+++ b/mm/Makefile
@@@ -33,4 -33,5 +33,5 @@@ obj-$(CONFIG_FS_XIP) += filemap_xip.
obj-$(CONFIG_MIGRATION) += migrate.o
obj-$(CONFIG_SMP) += allocpercpu.o
obj-$(CONFIG_QUICKLIST) += quicklist.o
-obj-$(CONFIG_CGROUP_MEM_RES_CTLR) += memcontrol.o
+obj-$(CONFIG_CGROUP_MEM_RES_CTLR) += memcontrol.o page_cgroup.o
+ obj-$(CONFIG_KMEMTRACE) += kmemtrace.o
next reply other threads:[~2008-10-21 4:55 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-21 4:55 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-11-03 4:26 linux-next: manual merge of the slab tree Stephen Rothwell
2008-11-03 9:39 ` Pekka Enberg
2008-11-03 4:19 Stephen Rothwell
2008-11-03 4:52 ` KOSAKI Motohiro
2008-11-03 9:39 ` Pekka Enberg
2008-11-03 4:07 Stephen Rothwell
2008-11-03 9:38 ` Pekka Enberg
2008-08-13 4:57 Stephen Rothwell
2008-08-13 6:19 ` Pekka Enberg
2008-08-13 7:11 ` Stephen Rothwell
2008-08-13 7:10 ` Pekka Enberg
2008-08-13 7:36 ` Stephen Rothwell
2008-08-13 7:21 ` Pekka Enberg
2008-08-13 7:40 ` 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=20081021155510.64fcb2b6.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=cl@linux-foundation.org \
--cc=eduard.munteanu@linux360.ro \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-next@vger.kernel.org \
--cc=penberg@cs.helsinki.fi \
/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