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: 27677 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 74EEE2036E for ; Thu, 3 Apr 2014 09:28:49 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id n16sf6297434oag.1 for ; Thu, 03 Apr 2014 02:28:49 -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=8ceu4B/IP5tHdaHwjmKty9tlnz0IO+Nw5aqQhyplfJM=; b=hjXK9iODzKnlhfLFiU60CtUIvxUZ9aU4iAQht2Z9kYqeqPsPMDBLetUFgWtQ5ekcIO r4Ptf/6JtOrrq9F+DLYDUfw3t9G8ZXu636bIyxOcJi1hhSTiIbuyXv3U3DRNW4ovCLcX o3gl/gMfJDOP4s6NbLjArV7kJZ8CsPiwRgOKByGbOjmGvFQIFEJyKFlDxKDCGiNN1RYW 7r6iZdeHveJ5BIqy4EHqfYys2ZfTQVaCOGh/pVD48inpeaxsz7fCylLtW9HZ1W+WdSRu 5YO4j4yHZGVhdvoXN272T1NRTjTwSQ2uG2Hnqs5YAcU2MSWRxsHvuWdTySO3gNhncu8U rIRg== X-Gm-Message-State: ALoCoQnjo/3BKIVqGK8tlrZush/Wv/r4uJSeJhKd0EPREUOzxFYLMUoHLON+WjPVufWm7dR8J23T X-Received: by 10.42.211.15 with SMTP id gm15mr3136421icb.28.1396517328954; Thu, 03 Apr 2014 02:28:48 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.46.33 with SMTP id j30ls243679qga.67.gmail; Thu, 03 Apr 2014 02:28:48 -0700 (PDT) X-Received: by 10.221.29.137 with SMTP id ry9mr2081939vcb.6.1396517328868; Thu, 03 Apr 2014 02:28:48 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id x7si138299vel.54.2014.04.03.02.28.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Apr 2014 02:28:48 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.170 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.170; Received: by mail-vc0-f170.google.com with SMTP id hu19so1768183vcb.15 for ; Thu, 03 Apr 2014 02:28:48 -0700 (PDT) X-Received: by 10.221.37.1 with SMTP id tc1mr2078000vcb.32.1396517328769; Thu, 03 Apr 2014 02:28:48 -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 v8csp12708vcv; Thu, 3 Apr 2014 02:28:48 -0700 (PDT) X-Received: by 10.66.137.109 with SMTP id qh13mr6015872pab.39.1396517327721; Thu, 03 Apr 2014 02:28:47 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id eg2si2811448pac.141.2014.04.03.02.28.46; Thu, 03 Apr 2014 02:28:46 -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 S1751696AbaDCJ14 (ORCPT + 27 others); Thu, 3 Apr 2014 05:27:56 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:47792 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751564AbaDCJ1u (ORCPT ); Thu, 3 Apr 2014 05:27:50 -0400 Received: by mail-pd0-f173.google.com with SMTP id z10so1515798pdj.18 for ; Thu, 03 Apr 2014 02:27:50 -0700 (PDT) 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 CC: "Rafael J. Wysocki" , "linaro-acpi@lists.linaro.org" , Mark Brown , Will Deacon , "linux-kernel@vger.kernel.org" , Sudeep Holla , "linux-arm-kernel@lists.infradead.org" , Josh Boyer 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> 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.170 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: , 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 --- 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 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