Re: [Qemu-devel] [PULL 00/37] pci, pc, virtio: features, fixes

[Philippe Mathieu-Daudé]

On 5/16/19 6:04 PM, Peter Maydell wrote:
> On Thu, 16 May 2019 at 13:17, Michael S. Tsirkin <address@hidden> wrote:
>>
>> The following changes since commit efb4f3b62c69383a7308d7b739a3193e7c0ccae8:
>>
>>   Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' 
>> into staging (2019-05-10 14:49:36 +0100)
>>
>> are available in the Git repository at:
>>
>>   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
>>
>> for you to fetch changes up to 0534d255dae78450d90d59db0f3a9a46b32ebd73:
>>
>>   tests: acpi: print error unable to dump ACPI table during rebuild 
>> (2019-05-14 21:19:14 -0400)
>>
>> ----------------------------------------------------------------
>> pci, pc, virtio: features, fixes
>>
>> reconnect for vhost blk
>> tests for UEFI
>> misc other stuff
>>
>> Signed-off-by: Michael S. Tsirkin <address@hidden>
>>
>> ----------------------------------------------------------------
> 
> Hi -- this pullreq has a conflict in default-configs/arm-softmmu.mak
> because the conversion of arm to Kconfig has landed in master.
> Could you rebase and fix up to use whatever the Kconfig
> equivalent of these changes is, please?

Culprit is "hw/acpi: Consolidate build_mcfg to pci.c"

The conflict doesn't look trivial to resolve (to me) so I'd rather see
it reviewed (by Thomas). I suggest to drop the patch(es) from your PR :(

Regards,

Phil.