Merge branch 'pci/resource' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 14 Nov 2017 18:11:25 +0000 (12:11 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 14 Nov 2017 18:11:25 +0000 (12:11 -0600)
commit104d1e40cfcd69934f3f57c6abf13980eb703feb
treeb57f657381267187610c1dbc2606de2142ceca7d
parent8dceeaf8fff35a0b70a8cf3ca66883ac4bf4c9dd
parenta405f191f42ead45a03c000110a16683d30f7333
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
drivers/pci/pci.c
drivers/pci/pci.h
drivers/pci/setup-bus.c
include/linux/pci.h
include/uapi/linux/pci_regs.h