From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 14 Nov 2017 18:11:25 +0000 (-0600)
Subject: Merge branch 'pci/resource' into next
X-Git-Tag: v4.15-rc1~95^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=104d1e40cfcd69934f3f57c6abf13980eb703feb;p=platform%2Fkernel%2Flinux-exynos.git

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
---

104d1e40cfcd69934f3f57c6abf13980eb703feb