From: Avi Kivity <avi@redhat.com>
To: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Cc: kvm@vger.kernel.org, Markus Armbruster <armbru@redhat.com>
Subject: Re: [PATCH] block: Restore extboot functionality after mismerge
Date: Mon, 05 Jul 2010 15:40:54 +0300 [thread overview]
Message-ID: <4C31D2D6.40003@redhat.com> (raw)
In-Reply-To: <1278331370-26353-1-git-send-email-stefanha@linux.vnet.ibm.com>
On 07/05/2010 03:02 PM, Stefan Hajnoczi wrote:
> Extboot if=virtio,boot=on is broken due to a mismerge of:
>
> commit 666daa68234b5b1758652633cab07d5ca6046a5b
> Author: Markus Armbruster<armbru@redhat.com>
> Date: Wed Jun 2 18:48:27 2010 +0200
>
> blockdev: Collect block device code in new blockdev.c
>
> in:
>
> commit 55cbee9e738bfe7434081967f884209f1a9c994c
> Merge: a854beb 666daa6
> Author: Avi Kivity<avi@redhat.com>
> Date: Mon Jun 21 17:29:02 2010 +0300
>
> Merge commit '666daa68234b5b1758652633cab07d5ca6046a5b' into
> upstream-merge
>
> The extboot_drive global is no longer being initialized in drive_init().
> This patch restores the code to initialize extboot_drive.
>
Applied, thanks.
--
error compiling committee.c: too many arguments to function
prev parent reply other threads:[~2010-07-05 12:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-05 12:02 [PATCH] block: Restore extboot functionality after mismerge Stefan Hajnoczi
2010-07-05 12:40 ` Avi Kivity [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=4C31D2D6.40003@redhat.com \
--to=avi@redhat.com \
--cc=armbru@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=stefanha@linux.vnet.ibm.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).