On Mon, Jun 11, 2012 at 8:37 AM, Alex Williamson <alex.williamson@xxxxxxxxxx> wrote: > On Wed, 2012-06-06 at 13:05 +0200, Joerg Roedel wrote: >> On Wed, May 30, 2012 at 02:18:29PM -0600, Alex Williamson wrote: >> > v2: >> > - Trickle down changes from pci_get_dma_source() to better handle >> > PCI device reference counting in IOMMU driver patches >> >> Okay, I looked again over the code and looks good for merging to me. > > Great, thanks Joerg! > >> The >> IOMMU Groups code depends on changes in the PCI code. We need to work >> out how to merge this. >> >> Bjorn, >> >> I need the PCI changes before I can merge the IOMMU Groups code. There >> are two ways that would work for me: >> >> a) You Ack the PCI patch-set from Alex and I put it into my tree >> and merge the IOMMU Group code on-top, or >> b) You merge the PCI related patch-set into a seperate branch >> which you can merge into your next-branch and which I can >> pull in to merge IOMMU Groups on-top. >> >> Please let me know what works best for you. Joerg, I put the PCI changes into my "next" branch (http://git.kernel.org/?p=linux/kernel/git/helgaas/pci.git;a=shortlog;h=refs/heads/next). My feeble excuse is that I was on vacation last week, but that's pretty lame because this has been hanging for much longer than that. Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
