From: Tejun Heo <tj@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: build failure after merge of the memblock tree
Date: Thu, 8 Dec 2011 10:49:52 -0800 [thread overview]
Message-ID: <20111208184952.GA12108@google.com> (raw)
In-Reply-To: <CAOS58YOSp6VOJ6WCOyYf3KEJ=_p9ZG4LXmK8YiDgn4Y7DbVHKA@mail.gmail.com>
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
prev parent reply other threads:[~2011-12-08 18:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-06 3:38 linux-next: build failure after merge of the memblock tree Stephen Rothwell
2011-12-07 20:54 ` Stephen Rothwell
2011-12-07 21:30 ` Tejun Heo
2011-12-08 18:49 ` Tejun Heo [this message]
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=20111208184952.GA12108@google.com \
--to=tj@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.