From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Konrad@rcsinet12.oracle.com,
Jeremy Fitzhardinge <jeremy@goop.org>,
Xen Devel <Xen-devel@lists.xensource.com>,
Ian Campbell <ian.campbell@citrix.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
linux-kernel@vger.kernel.org, Alex Nixon <alex.nixon@citrix.com>,
linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the xen tree with the swiotlb tree
Date: Tue, 3 Aug 2010 09:48:29 -0400 [thread overview]
Message-ID: <20100803134829.GB4751@phenom.dumpdata.com> (raw)
In-Reply-To: <20100803141646.594e0fee.sfr@canb.auug.org.au>
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
WARNING: multiple messages have this Message-ID (diff)
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>,
Xen Devel <Xen-devel@lists.xensource.com>,
Ian Campbell <ian.campbell@citrix.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
linux-kernel@vger.kernel.org, Alex Nixon <alex.nixon@citrix.com>,
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
Date: Tue, 3 Aug 2010 09:48:29 -0400 [thread overview]
Message-ID: <20100803134829.GB4751@phenom.dumpdata.com> (raw)
In-Reply-To: <20100803141646.594e0fee.sfr@canb.auug.org.au>
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
next prev parent reply other threads:[~2010-08-03 13:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-03 4:16 linux-next: manual merge of the xen tree with the swiotlb tree Stephen Rothwell
2010-08-03 13:48 ` Konrad Rzeszutek Wilk [this message]
2010-08-03 13:48 ` [Xen-devel] " 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=20100803134829.GB4751@phenom.dumpdata.com \
--to=konrad.wilk@oracle.com \
--cc=Konrad@rcsinet12.oracle.com \
--cc=Xen-devel@lists.xensource.com \
--cc=alex.nixon@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=jeremy@goop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=stefano.stabellini@eu.citrix.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.