linux-kernel - Re: [GIT PULL] memblock for 2.6.37

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Thu, 21 Oct 2010 19:50:04 -0700
From:	"H. Peter Anvin" <hpa@...or.com>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
CC:	"H. Peter Anvin" <hpa@...ux.intel.com>,
	Benjamin Herrenschmidt <benh@...nel.crashing.org>,
	CAI Qian <caiqian@...hat.com>,
	"David S. Miller" <davem@...emloft.net>,
	Felipe Balbi <balbi@...com>, Ingo Molnar <mingo@...e.hu>,
	Jan Beulich <jbeulich@...ell.com>,
	Jeremy Fitzhardinge <jeremy.fitzhardinge@...rix.com>,
	Jeremy Fitzhardinge <jeremy@...p.org>,
	Kevin Hilman <khilman@...prootsystems.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Michael Ellerman <michael@...erman.id.au>,
	Michal Simek <monstr@...str.eu>,
	Paul Mundt <lethal@...ux-sh.org>,
	Peter Zijlstra <peterz@...radead.org>,
	Russell King <linux@....linux.org.uk>,
	Russell King <rmk@....linux.org.uk>,
	Stephen Rothwell <sfr@...b.auug.org.au>,
	Thomas Gleixner <tglx@...utronix.de>,
	Tomi Valkeinen <tomi.valkeinen@...ia.com>,
	Vivek Goyal <vgoyal@...hat.com>,
	Yinghai Lu <yinghai@...nel.org>,
	ext Grazvydas Ignotas <notasas@...il.com>, linux-mm@...ck.org
Subject: Re: [GIT PULL] memblock for 2.6.37

On 10/21/2010 06:59 PM, Linus Torvalds wrote:
> On Thu, Oct 21, 2010 at 5:50 PM, H. Peter Anvin <hpa@...ux.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.
> 

Sounds like a very good idea.  I'll take it as a request to continue to
do both if there are anything but trivial conflicts.


> 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
> 

You're right, my mistake.  Thanks for checking and fixing it up.

I will pull your tree later and test if and add the fixes for the other
trees.

	-hpa

-- 
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel.  I don't speak on their behalf.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/