Merge branch 'pci/host-thunder' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 14 Nov 2017 18:11:36 +0000 (12:11 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 14 Nov 2017 18:11:36 +0000 (12:11 -0600)
* pci/host-thunder:
  PCI: Avoid slot reset if bridge itself is broken
  PCI: Avoid bus reset if bridge itself is broken
  PCI: Mark Cavium CN8xxx to avoid bus reset

1  2 
drivers/pci/pci.c
drivers/pci/quirks.c

Simple merge
Simple merge