linux-kernel - linux-next: manual merge of the xen-pvhvm tree with the xen 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-next>] [day] [month] [year] [list]

Message-Id: <20101029114237.ae45f678.sfr@canb.auug.org.au>
Date:	Fri, 29 Oct 2010 11:42:37 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Stefano Stabellini <stefano.stabellini@...citrix.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Juan Quintela <quintela@...hat.com>,
	Jeremy Fitzhardinge <jeremy.fitzhardinge@...rix.com>,
	Ian Campbell <ian.campbell@...rix.com>
Subject: linux-next: manual merge of the xen-pvhvm tree with the xen tree

Hi Stefano,

Today's linux-next merge of the xen-pvhvm tree got a conflict in
arch/x86/xen/setup.c between commit
a1857ddc9ba2dfdbfd70171181e481f2f64b8d0b ("xen: do not release any memory
under 1M in domain 0") from the xen tree and commit
4ec5387cc36c6472a2ff2c82e9865abe8cab96c2 ("xen: add the direct mapping
area for ISA bus access") from the xen-pvhvm tree.

Just differences in a comment.  I just used the version from the xen
tree ...
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped