* [PATCH] PCI: Restore inclusion of pci/hotplug Kconfig
@ 2016-03-21 7:26 Tero Roponen
2016-03-21 12:40 ` Bjorn Helgaas
0 siblings, 1 reply; 2+ messages in thread
From: Tero Roponen @ 2016-03-21 7:26 UTC (permalink / raw)
To: bhelgaas; +Cc: linux-pci, linux-kernel
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>
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"
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] PCI: Restore inclusion of pci/hotplug Kconfig
2016-03-21 7:26 [PATCH] PCI: Restore inclusion of pci/hotplug Kconfig Tero Roponen
@ 2016-03-21 12:40 ` Bjorn Helgaas
0 siblings, 0 replies; 2+ messages in thread
From: Bjorn Helgaas @ 2016-03-21 12:40 UTC (permalink / raw)
To: Tero Roponen; +Cc: bhelgaas, linux-pci, linux-kernel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-03-21 12:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-21 7:26 [PATCH] PCI: Restore inclusion of pci/hotplug Kconfig Tero Roponen
2016-03-21 12:40 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).