From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35458) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZj0P-0002wH-DA for qemu-devel@nongnu.org; Thu, 11 Jan 2018 14:59:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZj0L-0006iP-Hk for qemu-devel@nongnu.org; Thu, 11 Jan 2018 14:59:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49528) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eZj0L-0006hy-CG for qemu-devel@nongnu.org; Thu, 11 Jan 2018 14:59:13 -0500 Date: Thu, 11 Jan 2018 21:59:11 +0200 From: "Michael S. Tsirkin" Message-ID: <20180111215839-mutt-send-email-mst@kernel.org> References: <1513866427-27125-1-git-send-email-mst@redhat.com> <20171221223704-mutt-send-email-mst@kernel.org> <20171222014258-mutt-send-email-mst@kernel.org> <20180109060920-mutt-send-email-mst@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: Re: [Qemu-devel] [PULL 00/25] pc, pci, virtio: features, fixes, cleanups List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= , QEMU Developers On Thu, Jan 11, 2018 at 03:31:08PM +0000, Peter Maydell wrote: > On 9 January 2018 at 04:11, Michael S. Tsirkin 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