tree b57f657381267187610c1dbc2606de2142ceca7d
parent 8dceeaf8fff35a0b70a8cf3ca66883ac4bf4c9dd
parent a405f191f42ead45a03c000110a16683d30f7333
author Bjorn Helgaas <bhelgaas@google.com> 1510683085 -0600
committer Bjorn Helgaas <bhelgaas@google.com> 1510683085 -0600

Merge branch 'pci/resource' into next

* pci/resource:
  PCI: Fail pci_map_rom() if the option ROM is invalid
  PCI: Move pci_map_rom() error path
  x86/PCI: Enable a 64bit BAR on AMD Family 15h (Models 00-1f, 30-3f, 60-7f)
  PCI: Add pci_resize_resource() for resizing BARs
  PCI: Add resizable BAR infrastructure
  PCI: Add PCI resource type mask #define