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 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
