Merge branch 'pci/virtualization' into next

Browse source

* pci/virtualization:
  PCI: Disable VF decoding before pcibios_sriov_disable() updates resources
  PCI: Add ACS quirk for APM X-Gene devices
  PCI: Mark AMD Stoney GPU ATS as broken

Conflicts:
	drivers/pci/quirks.c

...

This commit is contained in:

Bjorn Helgaas 2017-09-07 13:24:41 -05:00

parent 27e87395ae 0fc690a7c3

commit cf2d804110

2 changed files with 33 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

7

drivers/pci/iov.c

View file

29

drivers/pci/quirks.c

View file