All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bjorn Helgaas <helgaas@kernel.org>
To: Tero Roponen <tero.roponen@gmail.com>
Cc: bhelgaas@google.com, linux-pci@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] PCI: Restore inclusion of pci/hotplug Kconfig
Date: Mon, 21 Mar 2016 07:40:42 -0500	[thread overview]
Message-ID: <20160321124042.GB28507@localhost> (raw)
In-Reply-To: <alpine.LFD.2.20.1603210924030.16682@terrop.lan>

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

      reply	other threads:[~2016-03-21 12:40 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-21  7:26 [PATCH] PCI: Restore inclusion of pci/hotplug Kconfig Tero Roponen
2016-03-21 12:40 ` Bjorn Helgaas [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160321124042.GB28507@localhost \
    --to=helgaas@kernel.org \
    --cc=bhelgaas@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=tero.roponen@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.