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

[Michael S. Tsirkin]

On Thu, Jan 11, 2018 at 03:31:08PM +0000, Peter Maydell wrote:
> On 9 January 2018 at 04:11, Michael S. Tsirkin <address@hidden> 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

It should be pretty simple - all we did on pci tree
is change register bus to register root bus.
I'll do the merge.

-- 
MST