On 9 January 2018 at 04:11, Michael S. Tsirkin <m...@redhat.com> wrote:
> So it's an existing bug exposed by the test.
> I've reverted the test for now but I didn't rebase
> as there are downstream trees based on this pull req.

Hi -- I'm afraid this seems to have conflicts with the sparc
pullreq. I tried the simple textual merge resolution for
hw/pci-host/apb.c, but that then fails to compile.
Can you fix up and resend, please?

thanks
-- PMM

Reply via email to