From patchwork Thu Apr 3 09:27:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 3932171 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8E3349F2F7 for ; Thu, 3 Apr 2014 09:35:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C46C8202F0 for ; Thu, 3 Apr 2014 09:35:24 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CF92820225 for ; Thu, 3 Apr 2014 09:35:23 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WVe30-00043r-4Y; Thu, 03 Apr 2014 09:34:58 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WVe2r-0006Rk-QH; Thu, 03 Apr 2014 09:34:49 +0000 Received: from mail-pa0-f41.google.com ([209.85.220.41]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WVe2o-0006RF-9E for linux-arm-kernel@lists.infradead.org; Thu, 03 Apr 2014 09:34:47 +0000 Received: by mail-pa0-f41.google.com with SMTP id fa1so1572374pad.14 for ; Thu, 03 Apr 2014 02:34:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=y/ctHVTCpFuVKlnHE6jkxrJMazcfM0CDau+nfvB3HGQ=; b=FkOwYvFGUaHQ0SOph2ydZv5sYFAOoFyQ98U07RgaGJVEbst6LH0Pvb0Qp5jilKwMeZ pW9iv3RTbYz0j0ZP+huPGTOBLF3cgeT4ES+PtWP/G52+5JaJ4XZ+S/R+xRap+B4pkf+L SPbcqbfgZH2/NFhBZivxgT2tCKaBYyGBNYgrtDcq41gMg0ygeC32tUXaHLCtfQzv01Xj 5S+WKJb0PvGbs7z2Kmfu2jo6G2EC5IXkgyuyz6QuNr4BFCgqApi4QHLOFDKOhv2CtCy4 V/RvZM+2GXiSU/rx35w0h2PB7B8V9j+0JjF/+2dlRX+aQlvYKCMXewpEm/+HEIO6Oq1a CTPg== X-Gm-Message-State: ALoCoQlPKEI6l1dDX1y1OWydji5jhDaSHiUdt5ClEczC8DfgsH2g4/2Y6IRX94A4fDLg+PZaptdl X-Received: by 10.68.201.226 with SMTP id kd2mr5934852pbc.157.1396517270253; Thu, 03 Apr 2014 02:27:50 -0700 (PDT) Received: from [192.168.206.141] ([218.17.215.175]) by mx.google.com with ESMTPSA id x5sm9875419pbw.26.2014.04.03.02.27.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Apr 2014 02:27:49 -0700 (PDT) Message-ID: <533D2980.6000903@linaro.org> Date: Thu, 03 Apr 2014 17:27:28 +0800 From: Hanjun Guo User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Catalin Marinas , Viresh Kumar Subject: Re: [PATCH] arm64: Fix duplicated Kconfig entries again References: <1395738060-18489-1-git-send-email-hanjun.guo@linaro.org> <5334078A.9010408@arm.com> <53341ADF.2050904@linaro.org> <2765234.k5FCzWzCDz@vostro.rjw.lan> <533D1D5E.20208@linaro.org> <20140403085120.GB17022@arm.com> In-Reply-To: <20140403085120.GB17022@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140403_053446_420947_B48B5A10 X-CRM114-Status: GOOD ( 13.66 ) X-Spam-Score: -1.8 (-) Cc: Josh Boyer , Mark Brown , "Rafael J. Wysocki" , "linaro-acpi@lists.linaro.org" , Will Deacon , "linux-kernel@vger.kernel.org" , Sudeep Holla , "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 2014-4-3 16:51, Catalin Marinas wrote: > On Thu, Apr 03, 2014 at 09:41:57AM +0100, Viresh Kumar wrote: >> On Thu, Apr 3, 2014 at 2:05 PM, Hanjun Guo wrote: >>> How about the following patch? if it is ok, I will resend it. >> >> http://www.spinics.net/lists/arm-kernel/msg319545.html > > I can see commit 62d1a3ba5adc5653d43f6cd3a90758bb6ad5d5bd (arm64: Fix > duplicated Kconfig entries again) already in mainline, so problem > solved. > > Thanks Josh ;) Great, thanks Viresh to let me know this. Actually I also sent a patch named "arm64: Fix duplicated Kconfig entries again" about one week ago :) https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg612363.html And I think there is still a problem after commit 62d1a3ba - multi-entries for source "kernel/power/Kconfig", so how about the following fix? If it makes sense, I will send out a patch for it. Thanks Hanjun diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index e6e4d37..6085dca 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -317,14 +317,8 @@ config ARCH_SUSPEND_POSSIBLE config ARM64_CPU_SUSPEND def_bool PM_SLEEP -endmenu - -menu "CPU Power Management" - source "drivers/cpuidle/Kconfig" -source "kernel/power/Kconfig" - source "drivers/cpufreq/Kconfig" endmenu