From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 29 Sep 2017 19:46:13 +0000 (-0700)
Subject: Merge tag 'pci-v4.14-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa... 
X-Git-Tag: v4.14-rc3~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=93b5533ab58d635968ebb0939fe90f3b022601af;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'pci-v4.14-fixes-3' of git://git./linux/kernel/git/helgaas/pci

Pull PCI fixes from Bjorn Helgaas:

 - fix CONFIG_PCI=n build error (introduced in v4.14-rc1) (Geert
   Uytterhoeven)

 - fix a race in sysfs driver_override store/show (Nicolai Stange)

* tag 'pci-v4.14-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Fix race condition with driver_override
  PCI: Add dummy pci_acs_enabled() for CONFIG_PCI=n build
---

93b5533ab58d635968ebb0939fe90f3b022601af