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"
Hi Hanjun,
On 25/03/14 09:00, Hanjun Guo wrote:
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.
I reported this and Mark Brown posted the patch[1]. I assumed it is already pulled, but looks like that's not the case.
Regards, Sudeep
Hi Sudeep,
On 2014-3-25 18:00, Sudeep Holla wrote:
Hi Hanjun,
On 25/03/14 09:00, Hanjun Guo wrote:
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.
I reported this and Mark Brown posted the patch[1]. I assumed it is already pulled, but looks like that's not the case.
[...]
Yes, I noticed this patch in arm maillist, and I can see that this patch was already merged into linux-next, but I still got duplicate Power management options in the Kconfig: --------------------------------- menu "Power management options"
source "kernel/power/Kconfig"
config ARCH_SUSPEND_POSSIBLE def_bool y
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 -------------------------------- here is the link: https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/arch/a...
Thanks Hanjun
Hi Hanjun,
On 25/03/14 11:09, Hanjun Guo wrote:
Hi Sudeep,
On 2014-3-25 18:00, Sudeep Holla wrote:
Hi Hanjun,
On 25/03/14 09:00, Hanjun Guo wrote:
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.
I reported this and Mark Brown posted the patch[1]. I assumed it is already pulled, but looks like that's not the case.
[...]
[...]
here is the link: https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/arch/a...
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 :)
Regards, Sudeep
On 2014-3-27 19:12, Sudeep Holla wrote:
Hi Hanjun,
On 25/03/14 11:09, Hanjun Guo wrote:
Hi Sudeep,
On 2014-3-25 18:00, Sudeep Holla wrote:
Hi Hanjun,
On 25/03/14 09:00, Hanjun Guo wrote:
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.
I reported this and Mark Brown posted the patch[1]. I assumed it is already pulled, but looks like that's not the case.
[...]
[...]
here is the link: https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/arch/a...
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?
Thanks Hanjun
On Thursday, March 27, 2014 08:34:39 PM Hanjun Guo wrote:
On 2014-3-27 19:12, Sudeep Holla wrote:
Hi Hanjun,
On 25/03/14 11:09, Hanjun Guo wrote:
Hi Sudeep,
On 2014-3-25 18:00, Sudeep Holla wrote:
Hi Hanjun,
On 25/03/14 09:00, Hanjun Guo wrote:
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.
I reported this and Mark Brown posted the patch[1]. I assumed it is already pulled, but looks like that's not the case.
[...]
[...]
here is the link: https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/arch/a...
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.
Anyway, I'd rather not drop anything, but if you send me a revert, I can apply it.
Thanks!
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"
On Thu, Apr 3, 2014 at 2:05 PM, Hanjun Guo hanjun.guo@linaro.org wrote:
How about the following patch? if it is ok, I will resend it.
On Thu, Apr 03, 2014 at 09:41:57AM +0100, Viresh Kumar wrote:
On Thu, Apr 3, 2014 at 2:05 PM, Hanjun Guo hanjun.guo@linaro.org wrote:
How about the following patch? if it is ok, I will resend it.
I can see commit 62d1a3ba5adc5653d43f6cd3a90758bb6ad5d5bd (arm64: Fix duplicated Kconfig entries again) already in mainline, so problem solved.
Thanks Josh ;)
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 hanjun.guo@linaro.org wrote:
How about the following patch? if it is ok, I will resend it.
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?
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
If it makes sense, I will send out a patch for it.
Thanks Hanjun
On 2014-4-3 17:27, Hanjun Guo wrote:
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 hanjun.guo@linaro.org wrote:
How about the following patch? if it is ok, I will resend it.
I can see commit 62d1a3ba5adc5653d43f6cd3a90758bb6ad5d5bd (arm64: Fix duplicated Kconfig entries again) already in mainline, so problem solved.
Thanks Josh ;)
I just noticed Josh's patch half a hour ago, that's why I didn't review it...
On 3 April 2014 14:57, Hanjun Guo hanjun.guo@linaro.org wrote:
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?
I didn't notice that :)
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
If it makes sense, I will send out a patch for it.
We actually need to menu options here, menu "Power management options" menu "CPU Power Management"
And so probably you just need to do this:
-source "kernel/power/Kconfig"
from CPU Power Management options..
On 2014-4-3 17:38, Viresh Kumar wrote:
On 3 April 2014 14:57, Hanjun Guo hanjun.guo@linaro.org wrote:
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?
I didn't notice that :)
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
If it makes sense, I will send out a patch for it.
We actually need to menu options here, menu "Power management options" menu "CPU Power Management"
And so probably you just need to do this:
-source "kernel/power/Kconfig"
from CPU Power Management options..
Ok, will send out a patch later.
Thanks Hanjun
-
Catalin Marinas -
Hanjun Guo -
Rafael J. Wysocki -
Sudeep Holla -
Viresh Kumar