On Mon, Jun 25, 2018 at 05:59:33PM -0500, Bjorn Helgaas wrote: > The first patch fixes a NULL pointer dereference reported by Marc and would > be targeted for v4.18. > > The others simplify the shpchp probe path and would be for v4.19. > > --- > > Bjorn Helgaas (4): > PCI: shpchp: Manage SHPC unconditionally on non-ACPI systems > PCI: shpchp: Separate existence of SHPC and permission to use it > PCI: shpchp: Inline shpchp_is_native() > PCI: hotplug: Implement hotplug_is_native() only when CONFIG_ACPI=y I applied the first (with Marc's tested-by and Mika's reviewed-by) to for-linus for v4.18. I applied the others with Mika's reviewed-by to pci/hotplug for v4.19. > drivers/pci/hotplug/acpi_pcihp.c | 40 +++++++++++++++++++++++-------------- > drivers/pci/hotplug/shpchp_core.c | 21 +++++++++++++++++++ > drivers/pci/pci-acpi.c | 29 --------------------------- > include/linux/pci.h | 1 + > include/linux/pci_hotplug.h | 20 ++++++++++--------- > 5 files changed, 58 insertions(+), 53 deletions(-)
