From mboxrd@z Thu Jan 1 00:00:00 1970 From: 'Joerg Roedel' Subject: Re: [PATCH 08/13] allocation and free functions of virtual machine domain Date: Fri, 5 Dec 2008 20:22:24 +0100 Message-ID: <20081205192224.GC26459@8bytes.org> References: <715D42877B251141A38726ABF5CABF2C018BF0598E@pdsmsx503.ccr.corp.intel.com> <1228410780.3732.143.camel@blaa> <20081204231706.GO29705@8bytes.org> <1228468819.3858.7.camel@blaa> <715D42877B251141A38726ABF5CABF2C018BF4D86B@pdsmsx503.ccr.corp.intel.com> <49395B49.5060302@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: "Han, Weidong" , 'Mark McLoughlin' , "Yu, Fenghua" , "Woodhouse, David" , "'kvm@vger.kernel.org'" , 'Jesse Barnes' , "'iommu@lists.linux-foundation.org'" To: Avi Kivity Return-path: Received: from 8bytes.org ([88.198.83.132]:55863 "EHLO 8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753906AbYLETW0 (ORCPT ); Fri, 5 Dec 2008 14:22:26 -0500 Content-Disposition: inline In-Reply-To: <49395B49.5060302@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: On Fri, Dec 05, 2008 at 06:48:09PM +0200, Avi Kivity wrote: > Han, Weidong wrote: > > > >Will Avi merge intel-iommu changes into his master tree? If yes, we can > >push my patches and Joerg's patches together. Otherwise, I need rebase my > >patches to dwmw2's tree and push it into there first. > > > > I think the iommu patches should be merged into Dave's tree first; I'll > pull from that and apply the kvm patches. > > It all needs to be done soonish as 2.6.28 is imminent. Ok, I will send the AMD IOMMU specific parts upstream via Ingo's tree in a way that does not conflict with Han's patches and the IOMMU-API code when Linus pulls it. And as soon as Han sends out his rebased patchset I will rebase the IOMMU-API too and then everything should be fine. Joerg