On Thu, May 16, 2019 at 8:33 PM Philippe Mathieu-Daudé
<[email protected]> wrote:
> On 5/16/19 6:04 PM, Peter Maydell wrote:
> > On Thu, 16 May 2019 at 13:17, Michael S. Tsirkin <[email protected]> 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 <[email protected]>
> >>
> >> ----------------------------------------------------------------
> >
> > 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 :(
Thomas, FYI I did this to resolve the conflict:
- keep default-configs/arm-softmmu.mak from master:
git checkout origin/master default-configs/arm-softmmu.mak
- applied the following !fixup snippet:
-- >8 --
--- a/hw/acpi/Kconfig
+++ b/hw/acpi/Kconfig
@@ -25,7 +25,7 @@ config ACPI_NVDIMM
config ACPI_PCI
bool
- depends on ACPI
+ depends on ACPI && PCI
---
I felt it easier to review on top of "hw/acpi: Improve build modularity"
https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg04718.html
Sadly both series clash :(
Regards,
Phil.
