From patchwork Mon Mar 21 07:26:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Roponen X-Patchwork-Id: 8629901 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7B85CC0553 for ; Mon, 21 Mar 2016 07:26:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9FC8320274 for ; Mon, 21 Mar 2016 07:26:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B4C1320270 for ; Mon, 21 Mar 2016 07:26:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752411AbcCUH0q (ORCPT ); Mon, 21 Mar 2016 03:26:46 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:36150 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751349AbcCUH0p (ORCPT ); Mon, 21 Mar 2016 03:26:45 -0400 Received: by mail-wm0-f51.google.com with SMTP id r129so38355208wmr.1; Mon, 21 Mar 2016 00:26:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:user-agent:mime-version; bh=AngHKR5C5bbQ8la6HXkNJPQ47HpiTozOtTKnl5GztSQ=; b=I4p+byRzs9oTZswq9v9MmKbAiF0hyNEvP6mqZe2bmFvODnTCRfprWLE4AppP4UIwYS g8DMTNMJ4BTdkjjIfJV17XKuFcSC9FWPOD5yel9vNUS5Y3sN08URUdDQ87ap7e6qKRex 95ny846d2ebPyU9B8XMJ3rn6DXHJWGuVdQPjDN2nIe859ImbBG47NMElhF84jPcw9+0I RJfh95oTsmGFvI7zFWjXVHg9qo2iPbHgvpPolzrLISs/Ta7SPB97CL2qLAu1gCnb37fx Otep/KbLdgOmxgPW/vnCXThBotz9WJ0Vt4K7/eMELvT4P/2AE2urtMytjCwWrwIPL+rg 2KXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:user-agent :mime-version; bh=AngHKR5C5bbQ8la6HXkNJPQ47HpiTozOtTKnl5GztSQ=; b=ek/k5+LOjhmwd5BAWcQUQLkDsxy6Tz2olTx2Q9QFYoOLJ/paVEHG+X0oPO3u2PWemq qFXs1TwBBLcYyq4GDWIKgkZ3GmLPUiKz0w24IJkCW+UYYc5eq1oi/T0/IQMeCiYpQoyQ jLGj2LejTF1t5XtMRzN8dN1K86Fmes7bs3cg563Oseeepa5y3I+StnNF2bBXDYCWDDuy F/eMtqWUvc4gwLb2w0YIVzDyyuTSXSPElzK5/oU+jG8mv8Tdq0rb+tOshpjUL9yAfEur uOXBAiEuWBTLPYVTUKTfUzyygVKdIuP+x/5B2lQcyBOhQpThen295vEYYhCAKNIWIgsX jorQ== X-Gm-Message-State: AD7BkJIjo2VRG8vqM6ipuizUKi6G7YMp+38O+H1jxSgFLBk/om4n974SEPAyzgXR3qX0tQ== X-Received: by 10.28.179.84 with SMTP id c81mr12044878wmf.13.1458545204035; Mon, 21 Mar 2016 00:26:44 -0700 (PDT) Received: from terrop ([2001:2003:fabd:8400:28ed:b65:b1af:7e81]) by smtp.gmail.com with ESMTPSA id ks5sm23987840wjb.13.2016.03.21.00.26.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Mar 2016 00:26:43 -0700 (PDT) Date: Mon, 21 Mar 2016 09:26:41 +0200 (EET) From: Tero Roponen X-X-Sender: terrop@terrop.lan To: bhelgaas@google.com cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] PCI: Restore inclusion of pci/hotplug Kconfig Message-ID: User-Agent: Alpine 2.20 (LFD 67 2015-01-07) MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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"