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/
Home Products Support Community News


[Xen-devel] linux-next: manual merge of the xen tree with the swiotlb tr

To: Jeremy Fitzhardinge <jeremy@xxxxxxxx>, Xen Devel <Xen-devel@xxxxxxxxxxxxxxxxxxx>
Subject: [Xen-devel] linux-next: manual merge of the xen tree with the swiotlb tree
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 3 Aug 2010 14:16:46 +1000
Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>, Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>, Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx, Alex Nixon <alex.nixon@xxxxxxxxxx>, Konrad, linux-next@xxxxxxxxxxxxxxx
Delivery-date: Mon, 02 Aug 2010 21:17:24 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
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>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
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@xxxxxxxxxxxxxxxx

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

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