From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Jan 2018 21:14:54 +0000 (-0800)
Subject: Merge tag 'pci-v4.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8e66791a80abd0e86ac1995395129791eefe50b5;p=linux.git

Merge tag 'pci-v4.15-fixes-2' of git://git./linux/kernel/git/helgaas/pci

Pull PCI fixes from Bjorn Helgaas:
 "Fix AMD boot regression due to 64-bit window conflicting with system
  memory (Christian König)"

* tag 'pci-v4.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  x86/PCI: Move and shrink AMD 64-bit window to avoid conflict
  x86/PCI: Add "pci=big_root_window" option for AMD 64-bit windows
---

8e66791a80abd0e86ac1995395129791eefe50b5