From: Alex Williamson <alex.williamson@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Pankaj Gupta <pankaj.gupta.linux@gmail.com>,
Eduardo Habkost <ehabkost@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
David Hildenbrand <david@redhat.com>,
QEMU Developers <qemu-devel@nongnu.org>,
Peter Xu <peterx@redhat.com>,
Pankaj Gupta <pankaj.gupta@ionos.com>,
Auger Eric <eric.auger@redhat.com>,
Cai Huoqing <caihuoqing@baidu.com>,
teawater <teawaterz@linux.alibaba.com>,
Igor Mammedov <imammedo@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Marek Kedzierski <mkedzier@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
Wei Yang <richard.weiyang@linux.alibaba.com>
Subject: Re: [PULL 0/3] VFIO update 2021-07-13 (for v6.1)
Date: Wed, 14 Jul 2021 14:37:10 -0600 [thread overview]
Message-ID: <20210714143710.40546f4d.alex.williamson@redhat.com> (raw)
In-Reply-To: <CAFEAcA-m0hk1CTWj2W2bvYnuZgcn9xiUiS48kdopSgV-FkWcKg@mail.gmail.com>
On Wed, 14 Jul 2021 20:45:40 +0100
Peter Maydell <peter.maydell@linaro.org> wrote:
> On Tue, 13 Jul 2021 at 22:42, Alex Williamson
> <alex.williamson@redhat.com> wrote:
> >
> > The following changes since commit 961fef0ace0b2a997544deec2f01981b9c9c96e3:
> >
> > Merge remote-tracking branch 'remotes/alistair/tags/pull-riscv-to-apply-20210712' into staging (2021-07-13 17:51:50 +0100)
> >
...
>
> Something seems to have gone wrong with your pullrequest. Specifically,
> it appears to be based on commit 961fef0ace0b2a997 "Merge remote-tracking
> branch 'remotes/alistair/tags/pull-riscv-to-apply-20210712' into staging",
> which is not a commit that has ever been in master and indeed does not
> compile on all systems. (This is lucky, because if it had compiled
> I might not have noticed the mistake...)
>
> Pull requests should always be based only on commits in master.
Sorry about that, Peter. I'm glad you caught it. I'll respin against
current master. Thanks,
Alex
prev parent reply other threads:[~2021-07-14 20:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-13 21:29 [PULL 0/3] VFIO update 2021-07-13 (for v6.1) Alex Williamson
2021-07-13 21:29 ` [PULL 1/3] vfio: Fix CID 1458134 in vfio_register_ram_discard_listener() Alex Williamson
2021-07-13 21:29 ` [PULL 2/3] vfio/pci: Change to use vfio_pci_is() Alex Williamson
2021-07-13 21:30 ` [PULL 3/3] vfio/pci: Add pba_offset PCI quirk for BAIDU KUNLUN AI processor Alex Williamson
2021-07-14 19:45 ` [PULL 0/3] VFIO update 2021-07-13 (for v6.1) Peter Maydell
2021-07-14 20:37 ` Alex Williamson [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=20210714143710.40546f4d.alex.williamson@redhat.com \
--to=alex.williamson@redhat.com \
--cc=caihuoqing@baidu.com \
--cc=david@redhat.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=eric.auger@redhat.com \
--cc=imammedo@redhat.com \
--cc=mkedzier@redhat.com \
--cc=mst@redhat.com \
--cc=pankaj.gupta.linux@gmail.com \
--cc=pankaj.gupta@ionos.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.weiyang@linux.alibaba.com \
--cc=teawaterz@linux.alibaba.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).