linux-kernel - Re: [Xen-devel] linux-next: manual merge of the xen tree with the swiotlb 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: <20100803134829.GB4751@phenom.dumpdata.com>
Date:	Tue, 3 Aug 2010 09:48:29 -0400
From:	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Jeremy Fitzhardinge <jeremy@...p.org>,
	Xen Devel <Xen-devel@...ts.xensource.com>,
	Ian Campbell <ian.campbell@...rix.com>,
	Stefano Stabellini <stefano.stabellini@...citrix.com>,
	linux-kernel@...r.kernel.org, Alex Nixon <alex.nixon@...rix.com>,
	Konrad@...inet12.oracle.com, linux-next@...r.kernel.org
Subject: Re: [Xen-devel] linux-next: manual merge of the xen tree with the
 swiotlb tree

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@...b.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@...ts.xensource.com
> http://lists.xensource.com/xen-devel
--
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/