Bjorn Helgaas 64ae499cf2 Merge branch 'pci/portdrv' ... - move pcieport_if.h to drivers/pci/pcie/ to encapsulate it (Frederick Lawler) - merge pcieport_if.h into portdrv.h (Bjorn Helgaas) - move workaround for BIOS PME issue from portdrv to PCI core (Bjorn Helgaas) - completely disable portdrv with "pcie_ports=compat" (Bjorn Helgaas) - remove portdrv link order dependency (Bjorn Helgaas) - remove support for unused VC portdrv service (Bjorn Helgaas) - simplify portdrv feature permission checking (Bjorn Helgaas) - remove "pcie_hp=nomsi" parameter (use "pci=nomsi" instead) (Bjorn Helgaas) - remove unnecessary "pcie_ports=auto" parameter (Bjorn Helgaas) - use cached AER capability offset (Frederick Lawler) - don't enable DPC if BIOS hasn't granted AER control (Mika Westerberg) - rename pcie-dpc.c to dpc.c (Bjorn Helgaas) * pci/portdrv: PCI/DPC: Rename from pcie-dpc.c to dpc.c PCI/DPC: Do not enable DPC if AER control is not allowed by the BIOS PCI/AER: Use cached AER Capability offset PCI/portdrv: Rename and reverse sense of pcie_ports_auto PCI/portdrv: Encapsulate pcie_ports_auto inside the port driver PCI/portdrv: Remove unnecessary "pcie_ports=auto" parameter PCI/portdrv: Remove "pcie_hp=nomsi" kernel parameter PCI/portdrv: Remove unnecessary include of <linux/pci-aspm.h> PCI/portdrv: Simplify PCIe feature permission checking PCI/portdrv: Remove unused PCIE_PORT_SERVICE_VC PCI/portdrv: Remove pcie_port_bus_type link order dependency PCI/portdrv: Disable port driver in compat mode PCI/PM: Clear PCIe PME Status bit for Root Complex Event Collectors PCI/PM: Clear PCIe PME Status bit in core, not PCIe port driver PCI/PM: Move pcie_clear_root_pme_status() to core PCI/portdrv: Merge pcieport_if.h into portdrv.h PCI/portdrv: Move pcieport_if.h to drivers/pci/pcie/ Conflicts: drivers/pci/pcie/Makefile drivers/pci/pcie/portdrv.h		2018-04-04 13:27:58 -05:00
..
aer	Merge branch 'pci/portdrv'	2018-04-04 13:27:58 -05:00
aspm.c	Merge branch 'pci/misc'	2018-04-04 13:27:45 -05:00
dpc.c	PCI/DPC: Rename from pcie-dpc.c to dpc.c	2018-03-31 17:48:57 -05:00
Kconfig	Merge branch 'pci/spdx' into next	2018-02-01 11:40:07 -06:00
Makefile	Merge branch 'pci/portdrv'	2018-04-04 13:27:58 -05:00
pme.c	PCI/portdrv: Merge pcieport_if.h into portdrv.h	2018-03-09 11:42:01 -06:00
portdrv_acpi.c	PCI/DPC: Do not enable DPC if AER control is not allowed by the BIOS	2018-03-30 17:33:34 -05:00
portdrv_core.c	Merge branch 'pci/portdrv'	2018-04-04 13:27:58 -05:00
portdrv_pci.c	Merge branch 'pci/portdrv'	2018-04-04 13:27:58 -05:00
portdrv.h	Merge branch 'pci/portdrv'	2018-04-04 13:27:58 -05:00
ptm.c	Merge branch 'pci/spdx' into next	2018-02-01 11:40:07 -06:00