From: Paolo Bonzini <pbonzini@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>,
Gerd Hoffmann <kraxel@redhat.com>
Cc: QEMU Developers <qemu-devel@nongnu.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
Aleksandar Rikalo <arikalo@wavecomp.com>,
Aleksandar Markovic <amarkovic@wavecomp.com>,
Aurelien Jarno <aurelien@aurel32.net>
Subject: Re: [Qemu-devel] [PULL 0/5] Vga 20190308 patches
Date: Mon, 11 Mar 2019 14:33:59 +0100 [thread overview]
Message-ID: <31a1fc19-377b-4339-480e-fed2c919481f@redhat.com> (raw)
In-Reply-To: <CAFEAcA-trb9TKzEtbbSXEJapBrqUpBvLFE5zFObMRqD9u6zeJg@mail.gmail.com>
On 09/03/19 15:42, Peter Maydell wrote:
> On Fri, 8 Mar 2019 at 12:42, Gerd Hoffmann <kraxel@redhat.com> 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?
Should be:
config ATI_VGA
bool
default y if PCI_DEVICES
depends on PCI
select VGA
Paolo
prev parent reply other threads:[~2019-03-11 13:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-08 12:39 [Qemu-devel] [PULL 0/5] Vga 20190308 patches Gerd Hoffmann
2019-03-08 12:39 ` [Qemu-devel] [PULL 1/5] hw/display: Add basic ATI VGA emulation Gerd Hoffmann
2019-03-08 16:16 ` BALATON Zoltan
2019-03-08 12:39 ` [Qemu-devel] [PULL 2/5] mips_fulong2e: Add on-board graphics chip Gerd Hoffmann
2019-03-08 12:39 ` [Qemu-devel] [PULL 3/5] virtio: add class_size to VirtioPCIDeviceTypeInfo Gerd Hoffmann
2019-03-08 12:39 ` [Qemu-devel] [PULL 4/5] virtio-vga: fix reset Gerd Hoffmann
2019-03-08 12:39 ` [Qemu-devel] [PULL 5/5] virtio-gpu: make virtio_gpu_reset static Gerd Hoffmann
2019-03-09 14:42 ` [Qemu-devel] [PULL 0/5] Vga 20190308 patches Peter Maydell
2019-03-11 13:33 ` Paolo Bonzini [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=31a1fc19-377b-4339-480e-fed2c919481f@redhat.com \
--to=pbonzini@redhat.com \
--cc=amarkovic@wavecomp.com \
--cc=arikalo@wavecomp.com \
--cc=aurelien@aurel32.net \
--cc=kraxel@redhat.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.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).