| Message ID | alpine.LFD.2.20.1603210924030.16682@terrop.lan (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Mon, Mar 21, 2016 at 09:26:41AM +0200, Tero Roponen wrote: > Commit e7e127e3c767 ("PCI: Include pci/hotplug Kconfig directly > from pci/Kconfig") added one line to pci/Kconfig. However, for > some mysterious reason it isn't there now, even though there > are no traces of removing it in the git log. > > I detected this issue when 'make oldconfig' removed all the > options that depended on HOTPLUG_PCI. > > Signed-off-by: Tero Roponen <tero.roponen@gmail.com> Thanks for catching this, Tero! I botched the pci/hv merge and dropped this line. I applied this to for-linus and will ask Linus to pull it before v4.6-rc1. > diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig > index a1f37db..209292e 100644 > --- a/drivers/pci/Kconfig > +++ b/drivers/pci/Kconfig > @@ -128,4 +128,5 @@ config PCI_HYPERV > The PCI device frontend driver allows the kernel to import arbitrary > PCI devices from a PCI backend to support PCI driver domains. > > +source "drivers/pci/hotplug/Kconfig" > source "drivers/pci/host/Kconfig" > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index a1f37db..209292e 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -128,4 +128,5 @@ config PCI_HYPERV The PCI device frontend driver allows the kernel to import arbitrary PCI devices from a PCI backend to support PCI driver domains. +source "drivers/pci/hotplug/Kconfig" source "drivers/pci/host/Kconfig"
Commit e7e127e3c767 ("PCI: Include pci/hotplug Kconfig directly from pci/Kconfig") added one line to pci/Kconfig. However, for some mysterious reason it isn't there now, even though there are no traces of removing it in the git log. I detected this issue when 'make oldconfig' removed all the options that depended on HOTPLUG_PCI. Signed-off-by: Tero Roponen <tero.roponen@gmail.com> -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html