From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Stefano Stabellini <Stefano.Stabellini@eu.citrix.com>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Juan Quintela <quintela@redhat.com>,
Jeremy Fitzhardinge <Jeremy.Fitzhardinge@citrix.com>,
Ian Campbell <Ian.Campbell@eu.citrix.com>
Subject: Re: linux-next: manual merge of the xen-pvhvm tree with the xen tree
Date: Fri, 29 Oct 2010 17:28:59 +0100 [thread overview]
Message-ID: <alpine.DEB.2.00.1010291728470.1407@kaball-desktop> (raw)
In-Reply-To: <20101029114237.ae45f678.sfr@canb.auug.org.au>
On Fri, 29 Oct 2010, Stephen Rothwell wrote:
> Hi Stefano,
>
> Today's linux-next merge of the xen-pvhvm tree got a conflict in
> arch/x86/xen/setup.c between commit
> a1857ddc9ba2dfdbfd70171181e481f2f64b8d0b ("xen: do not release any memory
> under 1M in domain 0") from the xen tree and commit
> 4ec5387cc36c6472a2ff2c82e9865abe8cab96c2 ("xen: add the direct mapping
> area for ISA bus access") from the xen-pvhvm tree.
>
> Just differences in a comment. I just used the version from the xen
> tree ...
I think is fine
prev parent reply other threads:[~2010-10-29 16:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-29 0:42 Stephen Rothwell
2010-10-29 16:28 ` Stefano Stabellini [this message]
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=alpine.DEB.2.00.1010291728470.1407@kaball-desktop \
--to=stefano.stabellini@eu.citrix.com \
--cc=Ian.Campbell@eu.citrix.com \
--cc=Jeremy.Fitzhardinge@citrix.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=quintela@redhat.com \
--cc=sfr@canb.auug.org.au \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®