From patchwork Tue Jun 25 09:17:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sedat Dilek X-Patchwork-Id: 2775491 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 72CE5C0AB1 for ; Tue, 25 Jun 2013 09:18:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 81CBC201B3 for ; Tue, 25 Jun 2013 09:18:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 30A252014B for ; Tue, 25 Jun 2013 09:18:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751879Ab3FYJR7 (ORCPT ); Tue, 25 Jun 2013 05:17:59 -0400 Received: from mail-we0-f181.google.com ([74.125.82.181]:34708 "EHLO mail-we0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751873Ab3FYJR5 (ORCPT ); Tue, 25 Jun 2013 05:17:57 -0400 Received: by mail-we0-f181.google.com with SMTP id p58so9127681wes.12 for ; Tue, 25 Jun 2013 02:17:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:date:message-id:subject:from:to:cc :content-type; bh=fOMv42GUxhPqfOrJ91JeihP7KdK51PRSBEVLA7BK6S0=; b=BK8qNQLY7Uup/Lzfp4EjzRyzNiAh6EmOdKQFiY/Quhu0cnbEZwIyYzxNLCeGgbok5V IEp+bTpg4vwHUUly7vKLmoDzbUyj3okoEhaMnmMCWUv08rMBWM1W7uAMilZAfUnThTLu Xlo+a0EUHe49DfqJ2iVKFOHDPHNn7iyaV6mq/n+1LgjExjp7/BOxYzVqxvlJMFZfLAaq OtPGRR0jF1KgY71Nz8276zXUtPwTXAanuvQGlq3OMBydSVuOu2tlCQ6f0dpV8KnsFoH9 U0liIR2P2uIYXVEDLHE7waF4kwB/TgBpIRf2A1cE/Xynoy4Xy2KqVc8t6crCRf9WuabG /f6A== MIME-Version: 1.0 X-Received: by 10.180.198.175 with SMTP id jd15mr8424330wic.28.1372151876281; Tue, 25 Jun 2013 02:17:56 -0700 (PDT) Received: by 10.216.192.8 with HTTP; Tue, 25 Jun 2013 02:17:56 -0700 (PDT) Reply-To: sedat.dilek@gmail.com Date: Tue, 25 Jun 2013 11:17:56 +0200 Message-ID: Subject: Re: linux-next: Tree for Jun 25 [ kbuild or rapidio? ] From: Sedat Dilek To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, Michal Marek , "Yann E. MORIN" , Alexandre Bounine , Matt Porter Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-8.1 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 On Tue, Jun 25, 2013 at 10:55 AM, Sedat Dilek wrote: > On Tue, Jun 25, 2013 at 10:44 AM, Stephen Rothwell wrote: >> Hi all, >> >> Changes since 20130624: >> >> The vfs tree lost its build failure. >> >> The net-next tree gained a conflict against the net tree. >> >> The usb tree gained a conflict against the devicetree tree. >> >> The staging tree lost its build failure. >> >> The msm tree gained a conflict against the arm-soc tree. >> >> The samsung tree gained a conflict against the tip tree. >> >> The akpm tree lost a patch that turned up elsewhere and gained a conflict >> against the samsung tree. >> >> ---------------------------------------------------------------------------- >> > > [ CC linux-kbuild folks ] > > Not sure what's going on, but I get this with today's Linux-Next. > ( Yesterday's next-20130624 was OK. ) > > $ LANG=C LC_ALL=C yes "" | make oldconfig && LANG=C LC_ALL=C make > silentoldconfig ... > # > # configuration written to .config > # > scripts/kconfig/conf --silentoldconfig Kconfig > * > * Restart config... > * > * > * Bus options (PCI etc.) > * > PCI support (PCI) [Y/n/?] y > Support mmconfig PCI config space access (PCI_MMCONFIG) [Y/n] y > Read CNB20LE Host Bridge Windows (PCI_CNB20LE_QUIRK) [N/y/?] n > PCI Express support (PCIEPORTBUS) [Y/n/?] y > PCI Express Hotplug driver (HOTPLUG_PCI_PCIE) [Y/n/m/?] y > Root Port Advanced Error Reporting support (PCIEAER) [Y/n/?] y > PCI Express ECRC settings control (PCIE_ECRC) [N/y/?] n > PCIe AER error injector support (PCIEAER_INJECT) [N/m/y/?] n > PCI Express ASPM control (PCIEASPM) [Y/n/?] y > Debug PCI Express ASPM (PCIEASPM_DEBUG) [N/y/?] n > Default ASPM policy > > 1. BIOS default (PCIEASPM_DEFAULT) > 2. Powersave (PCIEASPM_POWERSAVE) > 3. Performance (PCIEASPM_PERFORMANCE) > choice[1-3]: 1 > Message Signaled Interrupts (MSI and MSI-X) (PCI_MSI) [Y/?] y > PCI Debugging (PCI_DEBUG) [N/y/?] n > Enable PCI resource re-allocation detection (PCI_REALLOC_ENABLE_AUTO) [Y/n/?] y > PCI Stub driver (PCI_STUB) [M/n/y/?] m > Interrupts on hypertransport devices (HT_IRQ) [Y/n/?] y > PCI IOV support (PCI_IOV) [Y/n/?] y > PCI PRI support (PCI_PRI) [Y/?] y > PCI PASID support (PCI_PASID) [Y/?] y > PCI IO-APIC hotplug support (PCI_IOAPIC) [Y/n/m] y > ISA-style DMA support (ISA_DMA_API) [Y/n/?] y > RapidIO support (RAPIDIO) [Y/n/?] y > IDT Tsi721 PCI Express SRIO Controller support (RAPIDIO_TSI721) [Y/n/?] y > Discovery timeout duration (seconds) (RAPIDIO_DISC_TIMEOUT) [30] 30 > Enable RapidIO Input/Output Ports (RAPIDIO_ENABLE_RX_TX_PORTS) [N/y/?] n > DMA Engine support for RapidIO (RAPIDIO_DMA_ENGINE) [Y/n/?] y > RapidIO subsystem debug messages (RAPIDIO_DEBUG) [N/y/?] n > Enumeration method [M/y/?] (NEW) aborted! > > Console input/output is redirected. Run 'make oldconfig' to update > configuration. > > make[1]: *** [silentoldconfig] Error 1 > make: *** [silentoldconfig] Error 2 > [ CC rapidio maintainers ] Not sure if the Kconfig-logic is wrong for RAPIDIO... or choice/endchoice has now problems with tristate... Switching from tristate to bool makes the error go away. Please, have a look at "rapidio: make enumeration/discovery configurable" [1]. [ drivers/rapidio/Kconfig ] ... +choice + prompt "Enumeration method" + depends on RAPIDIO + default RAPIDIO_ENUM_BASIC + help + There are different enumeration and discovery mechanisms offered + for RapidIO subsystem. You may select single built-in method or + or any number of methods to be built as modules. + Selecting a built-in method disables use of loadable methods. + + If unsure, select Basic built-in. + +config RAPIDIO_ENUM_BASIC + tristate "Basic" + help + This option includes basic RapidIO fabric enumeration and discovery + mechanism similar to one described in RapidIO specification Annex 1. + +endchoice + ... - Sedat - [1] http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=a11650e11093ed57dca78bf16e7836517c599098 > - Sedat - --- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" 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/rapidio/Kconfig b/drivers/rapidio/Kconfig index 5ab0564..c43b413 100644 --- a/drivers/rapidio/Kconfig +++ b/drivers/rapidio/Kconfig @@ -60,7 +60,7 @@ choice If unsure, select Basic built-in. config RAPIDIO_ENUM_BASIC - tristate "Basic" + bool "Basic" help This option includes basic RapidIO fabric enumeration and discovery mechanism similar to one described in RapidIO specification Annex 1.