WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] Re: linux-next: manual merge of the xen tree with Linus' tre

To: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Subject: [Xen-devel] Re: linux-next: manual merge of the xen tree with Linus' tree
From: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Date: Mon, 26 Jul 2010 23:08:38 -0700
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>, Xen Devel <Xen-devel@xxxxxxxxxxxxxxxxxxx>, linux-next@xxxxxxxxxxxxxxx, Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx
Delivery-date: Mon, 26 Jul 2010 23:09:33 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <20100727133207.9b6846fe.sfr@xxxxxxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <20100727133207.9b6846fe.sfr@xxxxxxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.7) Gecko/20100720 Fedora/3.1.1-1.fc13 Lightning/1.0b2pre Thunderbird/3.1.1
 On 07/26/2010 08:32 PM, Stephen Rothwell wrote:
Hi all,

Today's linux-next merge of the xen tree got a conflict in
arch/x86/kernel/hpet.c between commit
ff4878089e1eaeac79d57878ad4ea32910fb4037 ("x86: Do not try to disable
hpet if it hasn't been initialized before") from Linus' tree and commit
ef7612e63eafaa6101f5d3185ed8d9bf232ba627 ("x86: Do not try to disable
hpet if it hasn't been initialized before") from the xen tree.

Two versions of the same patch.  I used the version from Linus' tree
since it was dated later and had been modified by Thomas.

Thanks, I was waiting for that to land.  I'll drop it from my branch.

    J


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

<Prev in Thread] Current Thread [Next in Thread>