linux-kernel - Re: linux-next: manual merge of the xen tree with the tip tree

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <4CC10D07.6000303@kernel.org>
Date:	Thu, 21 Oct 2010 21:03:19 -0700
From:	Yinghai Lu <yinghai@...nel.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Jeremy Fitzhardinge <jeremy@...p.org>,
	Xen Devel <Xen-devel@...ts.xensource.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Gianluca Guida <gianluca.guida@...rix.com>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Subject: Re: linux-next: manual merge of the xen tree with the tip tree

On 10/21/2010 08:36 PM, Stephen Rothwell wrote:
> Hi Jeremy,
> 
> On Fri, 22 Oct 2010 14:03:35 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>>
>> Today's linux-next merge of the xen tree got a conflict in
>> arch/x86/mm/init_32.c between commit
>> 1d931264af0f10649b35afa8fbd2e169da51ac08 ("x86-32, memblock: Make
>> add_highpages honor early reserved ranges") from the tip tree and commit
>> 07147a06ac3b1b028124ea00ba44e69eb8ea7685 ("x86/32: honor reservations of
>> high memory") from the xen tree.
>>
>> I have no idea how to fix this up, sorry, so I have used the xen tree
>> from next-20101021 for today.
> 

x86-32, memblock: Make add_highpages honor early reserved ranges

is updated version with memblock for

x86/32: honor reservations of high memory

Assume Jeremy would update the xen tree.

Thanks

	Yinghai

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