From patchwork Thu Apr 3 08:35:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 3931921 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 4DE3B9F334 for ; Thu, 3 Apr 2014 08:37:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7CBA120328 for ; Thu, 3 Apr 2014 08:37: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 6348C20320 for ; Thu, 3 Apr 2014 08:37: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 1WVd8c-0003Ep-Kb; Thu, 03 Apr 2014 08:36:43 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WVd8I-0004dQ-EK; Thu, 03 Apr 2014 08:36:22 +0000 Received: from mail-pd0-f181.google.com ([209.85.192.181]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WVd8F-0004cO-W2 for linux-arm-kernel@lists.infradead.org; Thu, 03 Apr 2014 08:36:20 +0000 Received: by mail-pd0-f181.google.com with SMTP id p10so1455162pdj.12 for ; Thu, 03 Apr 2014 01:35:54 -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=PYGDfBpHXfELabRFg+A44vMx+SYVTLVsKXPviSv0VXU=; b=g4sby5ehNccoHIlV9M6LHREyAjDe5Mjr312modp6VzJ9t3yYdZNDJhDSID28rOLl4v QNYlds+srwltEDgycbLJn9hV2siKPF3wBRRhIWvyJS7w50xL405KSargNQ7x9zt427E9 DbXHQEVQ8DS1P/V/Y3RZhovNNUrafmRVoxxhS+nr3SudzUK205v+EpEQxnyJQwKpz+pc jgYUjmBHk02fNw/0xoPk/bLRUn1iTakkOMI/hcHrQxqZdwNmJ8DrwcDHzGS2APCarutn MPr3ADoOZZmBAOjkkfdylZwOi1aOOFQjFM6tgg49Fr9+yBBkZLNFHSO9XtKcQ6JiOFqa YLjQ== X-Gm-Message-State: ALoCoQnjcVAkisxmO8g/pJHFepqT/3if2U6v01WccR5Mw63JYab27KqjSA880u9ZmrU184CVHBKc X-Received: by 10.66.151.205 with SMTP id us13mr5673834pab.93.1396514154151; Thu, 03 Apr 2014 01:35:54 -0700 (PDT) Received: from [192.168.206.141] ([218.17.215.175]) by mx.google.com with ESMTPSA id hr5sm21954337pac.18.2014.04.03.01.35.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Apr 2014 01:35:53 -0700 (PDT) Message-ID: <533D1D5E.20208@linaro.org> Date: Thu, 03 Apr 2014 16:35:42 +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: "Rafael J. Wysocki" 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> In-Reply-To: <2765234.k5FCzWzCDz@vostro.rjw.lan> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140403_043620_097212_7A754242 X-CRM114-Status: GOOD ( 15.34 ) X-Spam-Score: -1.1 (-) Cc: "linaro-acpi@lists.linaro.org" , Catalin Marinas , Mark Brown , 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 Hi Rafael, Sorry the late reply. On 2014-3-27 23:18, Rafael J. Wysocki wrote: [...] >>> Just had a look at the linux-next tree and looks like the original commit: >>> "cpufreq: enable ARM drivers on arm64" is pulled by both Catalin and Rafael >>> which has resulted in the fixup patch[1] not removing the duplicate entry >>> cleanly. >>> >>> If not too late it better to ask either Rafael or Catalin to drop both patches >>> from their tree, instead of creating 4 patches in total to enable cpufreq :) >> >> Rafael is on vacation now. >> >> Catalin, could you please handle this? > > Well, not really, I'm at a conference now. Oops... > > Anyway, I'd rather not drop anything, but if you send me a revert, I can apply it. Mark Brown sent another patch to fix this problem, and that patch already merged into mainline, but the problem is still there, so I think a single revert will not help. How about the following patch? if it is ok, I will resend it. After commit 74397174989e5 (arm64: Fix duplicated Kconfig entries), I still get a duplicate Power management options section in linux-next git repo, may be due to some merge conflicts, anyway, fix that in this patch. Signed-off-by: Hanjun Guo --- Based on linux-next repo, weird, did I miss something? --- arch/arm64/Kconfig | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index d9f23ad..6085dca 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -317,24 +317,12 @@ config ARCH_SUSPEND_POSSIBLE config ARM64_CPU_SUSPEND def_bool PM_SLEEP -endmenu - -menu "CPU Power Management" - source "drivers/cpuidle/Kconfig" source "drivers/cpufreq/Kconfig" endmenu -menu "Power management options" - -source "kernel/power/Kconfig" - -source "drivers/cpufreq/Kconfig" - -endmenu - source "net/Kconfig" source "drivers/Kconfig"