From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756637Ab0HCNtD (ORCPT ); Tue, 3 Aug 2010 09:49:03 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:33119 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756654Ab0HCNs5 (ORCPT >); Tue, 3 Aug 2010 09:48:57 -0400 Date: Tue, 3 Aug 2010 09:48:29 -0400 From: Konrad Rzeszutek Wilk To: Stephen Rothwell Cc: Jeremy Fitzhardinge , Xen Devel , Ian Campbell , Stefano Stabellini , linux-kernel@vger.kernel.org, Alex Nixon , Konrad@rcsinet12.oracle.com, linux-next@vger.kernel.org Subject: Re: [Xen-devel] linux-next: manual merge of the xen tree with the swiotlb tree Message-ID: <20100803134829.GB4751@phenom.dumpdata.com> References: <20100803141646.594e0fee.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100803141646.594e0fee.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.20 (2009-12-10) X-Source-IP: acsmt354.oracle.com [141.146.40.154] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090202.4C581E3B.02FC:SCFMA4539814,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Aug 03, 2010 at 02:16:46PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the xen tree got a conflict in > include/xen/xen-ops.h between commit > 08bbc9da92f7e44b9c208c6a1adba70c403b255e ("xen: Add > xen_create_contiguous_region") from the swiotlb tree and commit > 016b6f5fe8398b0291cece60b749d7c930a2e09c ("xen: Add suspend/resume > support for PV on HVM guests") from the xen tree. > > Just overlapping additions. I fixed it up (see below) and can carry the > fix as necessary. Thank you. > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au > > diff --cc include/xen/xen-ops.h > index d789c93,46bc81e..0000000 > --- a/include/xen/xen-ops.h > +++ b/include/xen/xen-ops.h > @@@ -14,10 -15,6 +15,12 @@@ void xen_mm_unpin_all(void) > void xen_timer_resume(void); > void xen_arch_resume(void); > > +extern unsigned long *xen_contiguous_bitmap; > +int xen_create_contiguous_region(unsigned long vstart, unsigned int order, > + unsigned int address_bits); > + > +void xen_destroy_contiguous_region(unsigned long vstart, unsigned int order); > + > + int xen_setup_shutdown_event(void); > + > #endif /* INCLUDE_XEN_OPS_H */ > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel