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: 27662 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f198.google.com (mail-yk0-f198.google.com [209.85.160.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2CB4B20490 for ; Thu, 3 Apr 2014 08:36:17 +0000 (UTC) Received: by mail-yk0-f198.google.com with SMTP id 9sf2458674ykp.9 for ; Thu, 03 Apr 2014 01:36:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:message-id:date:from:user-agent :mime-version:to:cc:subject:references:in-reply-to:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe :content-type:content-transfer-encoding; bh=7/cVdopPKdI16CA3oz3qkTbk6KWa2fPfef4RH1puHCk=; b=Mufca/W847WY5FNRiF/ZfnRH1EU5l+zDFwDjtKXaW5DumndYmSseE+ByMRMsjHppMS PlxrcU4i/62rQxUPW3HIGchcEQZHvcYDZ9z7y0cxy/0Nl94uOoOR8U0zfmqndziZEZa1 KJd1CWJ8OsElvFi+2FvHQBCckrVpiqoog7mTEefAWpDTQbyMy73Mh4kuu8HKtbv01Ptp WoC1N10kYhCnwtSTRqcgdi24HXdJqLoahQmWDL39rzDDq20YSy/tU6OMnNzLY/YDKfKu sxGr3E7vdeXUn3LY/wvJGsmpyT0o0uf79wiGBJRBQDVXMnDZrT60qRyO+PN15dslqoGg zoGQ== X-Gm-Message-State: ALoCoQkPTwz2Vn2c+vvO2FWhmEaHb3OWAOIKQ2MJYbzOnx1RDRU7+l5jAlOwMzRci24JMUzSzvFt X-Received: by 10.236.99.20 with SMTP id w20mr2831473yhf.50.1396514176617; Thu, 03 Apr 2014 01:36:16 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.48.39 with SMTP id n36ls579530qga.19.gmail; Thu, 03 Apr 2014 01:36:16 -0700 (PDT) X-Received: by 10.221.55.133 with SMTP id vy5mr1897291vcb.17.1396514176553; Thu, 03 Apr 2014 01:36:16 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id sc7si1123396vdc.157.2014.04.03.01.36.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Apr 2014 01:36:16 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id la4so1718299vcb.31 for ; Thu, 03 Apr 2014 01:36:16 -0700 (PDT) X-Received: by 10.220.106.84 with SMTP id w20mr1903428vco.18.1396514176469; Thu, 03 Apr 2014 01:36:16 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.12.8 with SMTP id v8csp9915vcv; Thu, 3 Apr 2014 01:36:15 -0700 (PDT) X-Received: by 10.68.131.202 with SMTP id oo10mr5784774pbb.35.1396514175215; Thu, 03 Apr 2014 01:36:15 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id jh5si2749248pbb.125.2014.04.03.01.36.14; Thu, 03 Apr 2014 01:36:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162592AbaDCIgF (ORCPT + 27 others); Thu, 3 Apr 2014 04:36:05 -0400 Received: from mail-pb0-f48.google.com ([209.85.160.48]:40820 "EHLO mail-pb0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1162555AbaDCIfy (ORCPT ); Thu, 3 Apr 2014 04:35:54 -0400 Received: by mail-pb0-f48.google.com with SMTP id md12so1496948pbc.7 for ; Thu, 03 Apr 2014 01:35:54 -0700 (PDT) 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" CC: Sudeep Holla , Catalin Marinas , Will Deacon , "linaro-acpi@lists.linaro.org" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , Mark Brown 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: hanjun.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ 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"