From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758052Ab0J2QaF (ORCPT ); Fri, 29 Oct 2010 12:30:05 -0400 Received: from smtp.eu.citrix.com ([62.200.22.115]:27013 "EHLO SMTP.EU.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751572Ab0J2QaA (ORCPT ); Fri, 29 Oct 2010 12:30:00 -0400 X-IronPort-AV: E=Sophos;i="4.58,260,1286150400"; d="scan'208";a="2596199" Date: Fri, 29 Oct 2010 17:28:59 +0100 From: Stefano Stabellini X-X-Sender: sstabellini@kaball-desktop To: Stephen Rothwell CC: Stefano Stabellini , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Juan Quintela , Jeremy Fitzhardinge , Ian Campbell Subject: Re: linux-next: manual merge of the xen-pvhvm tree with the xen tree In-Reply-To: <20101029114237.ae45f678.sfr@canb.auug.org.au> Message-ID: References: <20101029114237.ae45f678.sfr@canb.auug.org.au> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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