qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: Stefano Stabellini <sstabellini@kernel.org>
Cc: qemu-devel@nongnu.org
Subject: Re: [PULL 00/10] xenpvh machine
Date: Tue, 14 Feb 2023 11:10:58 +0000	[thread overview]
Message-ID: <CAFEAcA8hQZ8uyF80o=fSykggQb929X=+NweLUG9VE=2JVpP2Wg@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.2.22.394.2302131431430.4661@ubuntu-linux-20-04-desktop>

On Mon, 13 Feb 2023 at 22:34, Stefano Stabellini <sstabellini@kernel.org> wrote:
>
> On Mon, 13 Feb 2023, Peter Maydell wrote:
> > On Fri, 10 Feb 2023 at 22:27, Stefano Stabellini <sstabellini@kernel.org> wrote:
> > >
> > > The following changes since commit 90595cc9396bb910b148391fea2e78dd8c6c8b27:
> > >
> > >   Merge tag 'migration-20230209-pull-request' of https://gitlab.com/juan.quintela/qemu into staging (2023-02-10 10:50:21 +0000)
> > >
> > > are available in the Git repository at:
> > >
> > >   https://gitlab.com/sstabellini/qemu.git xenpvh
> > >
> > > for you to fetch changes up to 3f8ee848693872e3783cdcf2862be5421bb9cbcb:
> > >
> > >   meson.build: enable xenpv machine build for ARM (2023-02-10 14:23:47 -0800)
> >
> > Hi -- 'xenpvh' doesn't appear to be a signed tag:
> >
> > >From https://gitlab.com/sstabellini/qemu
> >  * branch                    xenpvh     -> FETCH_HEAD
> > error: FETCH_HEAD: cannot verify a non-tag object of type commit.
> > Does not appear to be a signed tag
>
> Sorry "xenpvh" was a branch name. Here is the corresponding signed tag:
>
> https://gitlab.com/sstabellini/qemu xenpvh-tag

Something weird has happened here -- I'm getting merge conflicts
in files in migration/ and in tests/unit/test-xbzrle.c, even though
your pullreq diffstat says it doesn't touch those files. Can you
try a rebase and resend?

thanks
-- PMM


  reply	other threads:[~2023-02-14 11:11 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-10 22:27 [PULL 00/10] xenpvh machine Stefano Stabellini
2023-02-10 22:27 ` [PULL 01/10] hw/i386/xen/: move xen-mapcache.c to hw/xen/ Stefano Stabellini
2023-02-10 22:27 ` [PULL 02/10] hw/i386/xen: rearrange xen_hvm_init_pc Stefano Stabellini
2023-02-10 22:27 ` [PULL 03/10] hw/i386/xen/xen-hvm: move x86-specific fields out of XenIOState Stefano Stabellini
2023-02-10 22:27 ` [PULL 04/10] xen-hvm: reorganize xen-hvm and move common function to xen-hvm-common Stefano Stabellini
2023-02-10 22:27 ` [PULL 05/10] include/hw/xen/xen_common: return error from xen_create_ioreq_server Stefano Stabellini
2023-02-10 22:27 ` [PULL 06/10] hw/xen/xen-hvm-common: skip ioreq creation on ioreq registration failure Stefano Stabellini
2023-02-10 22:27 ` [PULL 07/10] hw/xen/xen-hvm-common: Use g_new and error_report Stefano Stabellini
2023-02-10 22:27 ` [PULL 08/10] meson.build: do not set have_xen_pci_passthrough for aarch64 targets Stefano Stabellini
2023-02-10 22:27 ` [PULL 09/10] hw/arm: introduce xenpvh machine Stefano Stabellini
2023-02-10 22:27 ` [PULL 10/10] meson.build: enable xenpv machine build for ARM Stefano Stabellini
2023-02-13 15:44 ` [PULL 00/10] xenpvh machine Peter Maydell
2023-02-13 22:34   ` Stefano Stabellini
2023-02-14 11:10     ` Peter Maydell [this message]
2023-02-14 23:44       ` Stefano Stabellini
2023-02-15 15:15         ` David Woodhouse

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='CAFEAcA8hQZ8uyF80o=fSykggQb929X=+NweLUG9VE=2JVpP2Wg@mail.gmail.com' \
    --to=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=sstabellini@kernel.org \
    /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).