From: Linus Torvalds <torvalds@linux-foundation.org>
To: "H. Peter Anvin" <hpa@linux.intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
CAI Qian <caiqian@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Felipe Balbi <balbi@ti.com>, "H. Peter Anvin" <hpa@zytor.com>,
Ingo Molnar <mingo@elte.hu>, Jan Beulich <jbeulich@novell.com>,
Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>,
Jeremy Fitzhardinge <jeremy@goop.org>,
Kevin Hilman <khilman@deeprootsystems.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Michael Ellerman <michael@ellerman.id.au>,
Michal Simek <monstr@monstr.eu>, Paul Mundt <lethal@linux-sh.org>,
Peter Zijlstra <peterz@infradead.org>,
Russell King <linux@arm.linux.org.uk>,
Russell King <rmk@arm.linux.org.uk>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Thomas Gleixner <tglx@linutronix.de>,
Tomi Valkeinen <tomi.valkeinen@nokia.com>,
Vivek Goyal <vgoyal@redhat.com>, Yinghai Lu <yinghai@kernel.org>,
ext Grazvydas Ignotas <notasas@gmail.com>,
linux-mm@kvack.org
Subject: Re: [GIT PULL] memblock for 2.6.37
Date: Thu, 21 Oct 2010 18:59:16 -0700 [thread overview]
Message-ID: <AANLkTi=2tPU6qwuoOEfS7NfsNX+7vCYhvkHzNOcx4Gf3@mail.gmail.com> (raw)
In-Reply-To: <201010220050.o9M0ognt032167@hera.kernel.org>
On Thu, Oct 21, 2010 at 5:50 PM, H. Peter Anvin <hpa@linux.intel.com> wrote:
>
> The unmerged branch is at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-memblock-for-linus
>
> The premerged branch is at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-memblock-for-linus-merged
I always tend to take the unmerged version, because I want to see what
the conflicts are (it gives me some view of what clashes), but when
people do pre-merges I then try to compare my merge against theirs.
However, in this case, your pre-merged version differs. But I think
it's your merge that was incorrect. You left this line:
obj-$(CONFIG_HAVE_EARLY_RES) += early_res.o
in kernel/Makefile, even though kernel/early_res.c is gone.
I'll push out my merge, but please do verify that it all looks ok.
Linus
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2010-10-22 2:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-22 0:50 H. Peter Anvin
2010-10-22 1:59 ` Linus Torvalds [this message]
2010-10-22 2:50 ` H. Peter Anvin
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='AANLkTi=2tPU6qwuoOEfS7NfsNX+7vCYhvkHzNOcx4Gf3@mail.gmail.com' \
--to=torvalds@linux-foundation.org \
--cc=balbi@ti.com \
--cc=benh@kernel.crashing.org \
--cc=caiqian@redhat.com \
--cc=davem@davemloft.net \
--cc=hpa@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jbeulich@novell.com \
--cc=jeremy.fitzhardinge@citrix.com \
--cc=jeremy@goop.org \
--cc=khilman@deeprootsystems.com \
--cc=lethal@linux-sh.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux@arm.linux.org.uk \
--cc=michael@ellerman.id.au \
--cc=mingo@elte.hu \
--cc=monstr@monstr.eu \
--cc=notasas@gmail.com \
--cc=peterz@infradead.org \
--cc=rmk@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--cc=tomi.valkeinen@nokia.com \
--cc=vgoyal@redhat.com \
--cc=yinghai@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox