From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49111) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZzrI-0001Np-75 for qemu-devel@nongnu.org; Thu, 20 Dec 2018 10:03:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZzrD-0008H5-7K for qemu-devel@nongnu.org; Thu, 20 Dec 2018 10:03:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:30477) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gZzrB-0008Fe-UZ for qemu-devel@nongnu.org; Thu, 20 Dec 2018 10:03:26 -0500 Date: Thu, 20 Dec 2018 10:03:23 -0500 From: "Michael S. Tsirkin" Message-ID: <20181220095621-mutt-send-email-mst@kernel.org> References: <20181218161008.3882-1-mst@redhat.com> <20181220154959.4a598d84@Igors-MacBook-Pro.local> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181220154959.4a598d84@Igors-MacBook-Pro.local> Subject: Re: [Qemu-devel] [PULL v2 00/30] pci, pc, virtio: fixes, features List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov Cc: Peter Maydell , QEMU Developers On Thu, Dec 20, 2018 at 03:49:59PM +0100, Igor Mammedov wrote: > On Wed, 19 Dec 2018 19:15:26 +0000 > Peter Maydell wrote: > > > On Tue, 18 Dec 2018 at 16:11, Michael S. Tsirkin wrote: > > > > > > Changes from v1: > > > Drop > > > intel_iommu: turn on IR by default > > > > > > The following changes since commit f163448536e5f7ae8905b14547eab37a41a75f6c: > > > > > > Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20181216' into staging (2018-12-17 13:04:25 +0000) > > > > > > 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 d4ea2be7e8718ad6c1e5810bee6bdf5a0b8f31b8: > > > > > > hw/i386: Remove deprecated machines pc-0.10 and pc-0.11 (2018-12-18 11:09:02 -0500) > > > > > > ---------------------------------------------------------------- > > > pci, pc, virtio: fixes, features > > > > > > VTD fixes > > > ACPI refactoring > > > new names for virtio devices > > > multiple pcie link width/speeds > > > > > > Signed-off-by: Michael S. Tsirkin > > > > Hi; I'm afraid I get conflicts in some files which look > > too complicated for me to want to try to resolve at this end: > > Auto-merging tests/vmgenid-test.c > > CONFLICT (content): Merge conflict in tests/vmgenid-test.c > > Auto-merging tests/bios-tables-test.c > > CONFLICT (content): Merge conflict in tests/bios-tables-test.c > > Auto-merging tests/acpi-utils.h > > CONFLICT (content): Merge conflict in tests/acpi-utils.h > > Auto-merging tests/acpi-utils.c > > CONFLICT (content): Merge conflict in tests/acpi-utils.c > > Removing include/hw/smbios/ipmi.h > > I'm working on fixing conflicts due to 29/30 and will include conflicting patch in my acpi tests cleanup on respin > > Meanwhile could you drop 29/30 and apply the rest of pull request (which applies just fine)? I rebased it all. Preparing a pull request. Can you look at my tree for_upstream branch and confirm? Thanks! > > > > Please can you rebase and resend? > > > > thanks > > -- PMM > >