From: Stephen Rothwell on
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.
Stephen Rothwell sfr(a)

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 */
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)
More majordomo info at
Please read the FAQ at