On Wed, Dec 10, 2008 at 02:22:08PM +0000, David Woodhouse wrote: > On Wed, 2008-12-10 at 15:11 +0100, Joerg Roedel wrote: > > So now its open how this will be merged alltogether. We can merge it in > > three steps (first from Dave's tree, then Avi and at last my IOMMU > > updates which has to happen in that order). > > The other option is to merge this all with one pull-request I send to > > Linus. It should not conflict with your updates Avi because all these > > changes apply also cleanly to current linus/master. > > Is this acceptable for everyone? > > > > David, its important to hear your opinion on that because this single > > pull-request would include all VT-d updates you have queued in your > > tree? Is this ok for you? > > Yes, that's fine by me. Should I apply patches 1-14 of Weidong's patch > set from Monday first? Or just let you do that?
I already did it on-top of your tree because Han Weidong's patches 1-17 were rebased to your tree and my IOMMU-API patches apply on-top of his patches. Joerg -- | AMD Saxony Limited Liability Company & Co. KG Operating | Wilschdorfer Landstr. 101, 01109 Dresden, Germany System | Register Court Dresden: HRA 4896 Research | General Partner authorized to represent: Center | AMD Saxony LLC (Wilmington, Delaware, US) | General Manager of AMD Saxony LLC: Dr. Hans-R. Deppe, Thomas McCoy -- 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