diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-15 02:02:39 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-15 02:02:39 +0100 |
| commit | c4f988ee51ed896f5f709ba611a18485a2204ace (patch) | |
| tree | e466c49fd83c33a865c68d4525b1c2f1865f939c /Makefile | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| parent | PCI: rcar: Fix use-after-free in probe error path (diff) | |
| download | linux-c4f988ee51ed896f5f709ba611a18485a2204ace.tar.xz linux-c4f988ee51ed896f5f709ba611a18485a2204ace.zip | |
Merge tag 'pci-v4.15-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
- add a pci_get_domain_bus_and_slot() stub for the CONFIG_PCI=n case to
avoid build breakage in the v4.16 merge window if a
pci_get_bus_and_slot() -> pci_get_domain_bus_and_slot() patch gets
merged before the PCI tree (Randy Dunlap)
- fix an AMD boot regression in the 64bit BAR support added in v4.15
(Christian König)
- fix an R-Car use-after-free that causes a crash if no PCIe card is
present (Geert Uytterhoeven)
* tag 'pci-v4.15-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: rcar: Fix use-after-free in probe error path
x86/PCI: Only enable a 64bit BAR on single-socket AMD Family 15h
x86/PCI: Fix infinite loop in search for 64bit BAR placement
PCI: Add pci_get_domain_bus_and_slot() stub
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions