From: Jeremy Fitzhardinge <jeremy@goop.org>
To: Ian Campbell <Ian.Campbell@citrix.com>
Cc: Xen-devel <xen-devel@lists.xensource.com>,
"Marc - A. Dahlhaus [ Administration | Westermann GmbH ]"
<mad@wol.de>
Subject: Re: xen pv_ops git merge conflicts unresolved?
Date: Tue, 03 Mar 2009 09:33:42 -0800 [thread overview]
Message-ID: <49AD69F6.2070200@goop.org> (raw)
In-Reply-To: <1236085719.25103.79.camel@zakaz.uk.xensource.com>
Ian Campbell wrote:
> On Tue, 2009-03-03 at 05:14 -0500, Marc - A. Dahlhaus [ Administration |
> Westermann GmbH ] wrote:
>
>> Hello Jeremy,
>>
>>
>> it looks like there were some merge conflicts yesterday on the following
>> commits/files and they didn't got resolved properly...
>>
>
> The below fixes the 32 bit build for me although I still get a crash on
> boot.
>
Thanks for the fixup. I probably shouldn't have been operating
machinery yesterday.
The crash is probably because I committed the e820 memory rearranging
stuff into the wrong branch, but something may have broken us from
tip/master as well.
J
prev parent reply other threads:[~2009-03-03 17:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-03 10:14 xen pv_ops git merge conflicts unresolved? Marc - A. Dahlhaus [ Administration | Westermann GmbH ]
2009-03-03 13:08 ` Ian Campbell
2009-03-03 17:33 ` Jeremy Fitzhardinge [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=49AD69F6.2070200@goop.org \
--to=jeremy@goop.org \
--cc=Ian.Campbell@citrix.com \
--cc=mad@wol.de \
--cc=xen-devel@lists.xensource.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.