Subject: linux-next: manual merge of the rr tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 12 Jun 2009 13:54:29 +1000

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in init/main.c
between commit 83b519e8b9572c319c8e0c615ee5dd7272856090 ("slab: setup
allocators earlier in the boot sequence") from Linus' tree and commit
779e04433765330a3df44d3a4e5409cbf2963000 ("cpuhotplug: remove
cpu_hotplug_init()") from the rr tree.

Just context changes.  I fixed it up (see below) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc init/main.c
index 5616661,c1b68bb..0000000
--- a/init/main.c
+++ b/init/main.c
@@@ -664,12 -645,14 +664,11 @@@ asmlinkage void __init start_kernel(voi
  		initrd_start = 0;
  	}
  #endif
 -	vmalloc_init();
 -	vfs_caches_init_early();
  	cpuset_init_early();
  	page_cgroup_init();
 -	mem_init();
  	enable_debug_pagealloc();
- 	cpu_hotplug_init();
 -	kmem_cache_init();
  	kmemtrace_init();
 +	kmemleak_init();
  	debug_objects_mem_init();
  	idr_init_cache();
  	setup_per_cpu_pageset();