From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jeremy Fitzhardinge <jeremy@goop•org>,
Xen Devel <Xen-devel@lists•xensource.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Alex Nixon <alex.nixon@citrix•com>,
Ian Campbell <ian.campbell@citrix•com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle•com>,
Stefano Stabellini <stefano.stabellini@eu•citrix.com>
Subject: linux-next: manual merge of the xen tree with the swiotlb tree
Date: Tue, 3 Aug 2010 14:16:46 +1000 [thread overview]
Message-ID: <20100803141646.594e0fee.sfr@canb.auug.org.au> (raw)
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.
--
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 */
next reply other threads:[~2010-08-03 4:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-03 4:16 Stephen Rothwell [this message]
2010-08-03 13:48 ` linux-next: manual merge of the xen tree with the swiotlb tree Konrad Rzeszutek Wilk
-- strict thread matches above, loose matches on Subject: below --
2010-08-03 4:13 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100803141646.594e0fee.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Xen-devel@lists$(echo .)xensource.com \
--cc=alex.nixon@citrix$(echo .)com \
--cc=ian.campbell@citrix$(echo .)com \
--cc=jeremy@goop$(echo .)org \
--cc=konrad.wilk@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=stefano.stabellini@eu$(echo .)citrix.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox