From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tejun Heo Subject: Re: linux-next: build failure after merge of the memblock tree Date: Thu, 8 Dec 2011 10:49:52 -0800 Message-ID: <20111208184952.GA12108@google.com> References: <20111206143808.3fa5f3785538a37c9686734d@canb.auug.org.au> <20111208075405.911cefd2ee3c2ed81cdc5f4b@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-gx0-f174.google.com ([209.85.161.174]:44864 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751464Ab1LHSt4 (ORCPT ); Thu, 8 Dec 2011 13:49:56 -0500 Content-Disposition: inline In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Hello, On Wed, Dec 07, 2011 at 01:30:44PM -0800, Tejun Heo wrote: > Still trying to restore my cross build setup. I think I will be able > to send update series later today. Made the following changes, * Fix the CONFIG_HAVE typo bug. * Remove 7 space -> tab conversion in arch/score/Kconfig to ease conflict resolution. * Merge resolution in arch/arm/mm/init.c was incorrect. Both sort() and memblock_init() calls should be removed. Fixed. memblock-kill-early_node_map is now 7bd0b0f0da. git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git memblock-kill-early_node_map Merge result can be verified against the following branch (d8b950f4c3) git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git memblock-kill-early_node_map-next Thanks. -- tejun