On 20 May 2016 at 01:49, Bjorn Helgaas <[email protected]> wrote: > Hi Linus, > > Here are the PCI changes I intend for v4.7. > > There is a silent conflict that needs to be resolved when you pull this: > > - e3156048346c ("iommu/amd: Fix checking of pci dma aliases"), which is > already in your tree, added a use of PCI_DEV_FLAGS_DMA_ALIAS_DEVFN. > > - 338c3149a221 ("PCI: Add support for multiple DMA aliases"), which is > included in this pull request, replaces PCI_DEV_FLAGS_DMA_ALIAS_DEVFN > with pdev->dma_alias_mask to support multiple aliases. > > The conflict resolution I suggest is attached below. The identical patch > has been in linux-next and was supplied by both Jacek Lawrynowicz and Joerg > Roedel (and probably Stephen as well). >
Hi, can we consider pulling in Mika's changes again for this merge window, they fix a pretty serious power management regression since we started advertising Windows 2013 ACPI compat, as lots of dual GPU laptops can no longer switch off their secondary GPUs. I know they had an issue, but Mika seems to have fixed it promptly, and those patches aren't going to get much more testing out of tree. Dave.
