From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761310AbZFLEWY (ORCPT ); Fri, 12 Jun 2009 00:22:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752589AbZFLEVq (ORCPT ); Fri, 12 Jun 2009 00:21:46 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:37036 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752656AbZFLEVn (ORCPT ); Fri, 12 Jun 2009 00:21:43 -0400 Date: Fri, 12 Jun 2009 13:54:29 +1000 From: Stephen Rothwell To: Rusty Russell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Pekka Enberg Subject: linux-next: manual merge of the rr tree with Linus' tree Message-Id: <20090612135429.148b10b2.sfr@canb.auug.org.au> X-Mailer: Sylpheed 2.6.0 (GTK+ 2.16.2; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 sfr@canb.auug.org.au 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();