Message ID | 162621155674.487037.8788212042441164398.stgit@omen (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
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) > > are available in the Git repository at: > > git://github.com/awilliam/qemu-vfio.git tags/vfio-update-20210713.0 > > for you to fetch changes up to fefc1861d4ba8b9b4d7153dc6b359a65468d15cb: > > vfio/pci: Add pba_offset PCI quirk for BAIDU KUNLUN AI processor (2021-07-13 11:31:14 -0600) > > ---------------------------------------------------------------- > VFIO update 2021-07-13 > > * Coverity fix to discard listener (David Hildenbrand) > > * MSI-X PBA quirk for BAIDU VFs, additional helper use cases (Cai Huoqing) > > ---------------------------------------------------------------- > Cai Huoqing (2): > vfio/pci: Change to use vfio_pci_is() > vfio/pci: Add pba_offset PCI quirk for BAIDU KUNLUN AI processor > > David Hildenbrand (1): > vfio: Fix CID 1458134 in vfio_register_ram_discard_listener() > > hw/vfio/common.c | 3 ++- > hw/vfio/pci.c | 12 ++++++++++-- > include/hw/pci/pci_ids.h | 3 +++ > 3 files changed, 15 insertions(+), 3 deletions(-) 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. thanks -- PMM
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