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@xxxxxxxxxxxxxxxx
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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
