From: hanjun.guo@linaro•org (Hanjun Guo)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] arm64: Fix duplicated Kconfig entries again
Date: Thu, 03 Apr 2014 16:35:42 +0800 [thread overview]
Message-ID: <533D1D5E.20208@linaro.org> (raw)
In-Reply-To: <2765234.k5FCzWzCDz@vostro.rjw.lan>
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 <hanjun.guo@linaro•org>
---
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"
next prev parent reply other threads:[~2014-04-03 8:35 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-25 9:00 [PATCH] arm64: Fix duplicated Kconfig entries again Hanjun Guo
2014-03-25 10:00 ` [Linaro-acpi] " Sudeep Holla
2014-03-25 11:09 ` Hanjun Guo
2014-03-27 11:12 ` Sudeep Holla
2014-03-27 12:34 ` Hanjun Guo
2014-03-27 15:18 ` Rafael J. Wysocki
2014-04-03 8:35 ` Hanjun Guo [this message]
2014-04-03 8:41 ` Viresh Kumar
2014-04-03 8:51 ` Catalin Marinas
2014-04-03 9:27 ` Hanjun Guo
2014-04-03 9:30 ` Hanjun Guo
2014-04-03 9:38 ` Viresh Kumar
2014-04-03 11:01 ` Hanjun Guo
[not found] <CA+5PVA6awqaSHQboqdv9nynV9Xjp46VeqijDWxZX1v5wDK0NWQ@mail.gmail.com>
2014-04-02 5:06 ` arm64/cqufreq Kconfig error with v3.14-3893-gc12e69c6aaf7 Viresh Kumar
2014-04-02 14:40 ` [PATCH] arm64: Fix duplicated Kconfig entries again Josh Boyer
2014-04-03 4:23 ` Viresh Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=533D1D5E.20208@linaro.org \
--to=hanjun.guo@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox