linux-kernel - Re: 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-prev] [day] [month] [year] [list]

Message-ID: <alpine.DEB.2.00.1010291728470.1407@kaball-desktop>
Date:	Fri, 29 Oct 2010 17:28:59 +0100
From:	Stefano Stabellini <stefano.stabellini@...citrix.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Stefano Stabellini <Stefano.Stabellini@...citrix.com>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Juan Quintela <quintela@...hat.com>,
	Jeremy Fitzhardinge <Jeremy.Fitzhardinge@...rix.com>,
	Ian Campbell <Ian.Campbell@...citrix.com>
Subject: Re: linux-next: manual merge of the xen-pvhvm tree with the xen
 tree

On Fri, 29 Oct 2010, Stephen Rothwell wrote:
> 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 ...

I think is fine
--
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/