[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL 0/5] Vga 20190308 patches
|
From: |
Peter Maydell |
|
Subject: |
Re: [Qemu-devel] [PULL 0/5] Vga 20190308 patches |
|
Date: |
Sat, 9 Mar 2019 14:42:52 +0000 |
On Fri, 8 Mar 2019 at 12:42, Gerd Hoffmann <address@hidden> wrote:
>
> The following changes since commit 32694e98b8d7a246345448a8f707d2e11d6c65e2:
>
> Merge remote-tracking branch
> 'remotes/ehabkost/tags/machine-next-pull-request' into staging (2019-03-06
> 18:52:19 +0000)
>
> are available in the Git repository at:
>
> git://git.kraxel.org/qemu tags/vga-20190308-pull-request
>
> for you to fetch changes up to 61dbd9eaa1450f94886fb41366e4687d405c52c8:
>
> virtio-gpu: make virtio_gpu_reset static (2019-03-08 09:36:23 +0100)
>
> ----------------------------------------------------------------
> vga: virtio reset fix, add ati emulation.
>
> ----------------------------------------------------------------
Hi -- I'm afraid this has conflicted with the Kconfig merge:
CONFLICT (modify/delete): default-configs/pci.mak deleted in HEAD and
modified in remotes/kraxel/tags/vga-20190308-pull-request.
Can you figure out what the Kconfig equivalent of the
pci.mak change is and resend, please?
thanks
-- PMM
- [Qemu-devel] [PULL 0/5] Vga 20190308 patches, Gerd Hoffmann, 2019/03/08
- [Qemu-devel] [PULL 3/5] virtio: add class_size to VirtioPCIDeviceTypeInfo, Gerd Hoffmann, 2019/03/08
- [Qemu-devel] [PULL 5/5] virtio-gpu: make virtio_gpu_reset static, Gerd Hoffmann, 2019/03/08
- [Qemu-devel] [PULL 4/5] virtio-vga: fix reset., Gerd Hoffmann, 2019/03/08
- [Qemu-devel] [PULL 2/5] mips_fulong2e: Add on-board graphics chip, Gerd Hoffmann, 2019/03/08
- [Qemu-devel] [PULL 1/5] hw/display: Add basic ATI VGA emulation, Gerd Hoffmann, 2019/03/08
- Re: [Qemu-devel] [PULL 0/5] Vga 20190308 patches,
Peter Maydell <=