Skip to contentSkip to conversation

arm64: Fix duplicated Kconfig entries

PATCH New Mark Brown 3 participants 3 messages Mar 11, 2014 – Mar 12, 2014 arm64

lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 arm64: Fix duplicated Kconfig entries

From: Mark Brown <[email protected]>

Probably due to rebasing over the lengthy time it took to get the patch merged commit addea9ef055b (cpufreq: enable ARM drivers on arm64) added a duplicate Power management options section. Add CPUfreq to the CPU power management section and remove a duplicate include of the main power section.

Signed-off-by Mark Brown <[email protected]>
---
 arch/arm64/Kconfig | 6 ------
 1 file changed, 6 deletions(-)
arch/arm64/Kconfig +0 -6
index a3c40d65128b..2474c24dc229 100644
@@ -318,12 +318,6 @@ menu "CPU Power Management"
 
 source "drivers/cpuidle/Kconfig"
 
-endmenu
-
-menu "Power management options"
-
-source "kernel/power/Kconfig"
-
 source "drivers/cpufreq/Kconfig"
 
 endmenu
Signature · 1 line
1.9.0
#1 lore raw

PATCH 1/1 arm64: Fix duplicated Kconfig entries

Hi Mark,

Quoted 8 lines · Mark Brown

From: Mark Brown <[email protected]>

Probably due to rebasing over the lengthy time it took to get the patch merged commit addea9ef055b (cpufreq: enable ARM drivers on arm64) added a duplicate Power management options section. Add CPUfreq to the CPU power management section and remove a duplicate include of the main power section.

This looks fine to me, but since commit addea9ef055b is only in Rafael's next tree, Catalin can't take this, so it makes sense to go through Rafael's tree, right ?

Regards,
Sudeep

Quoted 23 lines
Signed-off-by Mark Brown <[email protected]>
---
  arch/arm64/Kconfig | 6 ------
  1 file changed, 6 deletions(-)
arch/arm64/Kconfig +0 -6
index a3c40d65128b..2474c24dc229 100644
@@ -318,12 +318,6 @@ menu "CPU Power Management"
 
  source "drivers/cpuidle/Kconfig"
 
-endmenu
-
-menu "Power management options"
-
-source "kernel/power/Kconfig"
-
  source "drivers/cpufreq/Kconfig"
 
  endmenu
maintainer
#2 lore raw

PATCH 1/1 arm64: Fix duplicated Kconfig entries

Quoted 9 lines · Sudeep Holla
Quoted 7 lines · Mark Brown

From: Mark Brown <[email protected]>

Probably due to rebasing over the lengthy time it took to get the patch merged commit addea9ef055b (cpufreq: enable ARM drivers on arm64) added a duplicate Power management options section. Add CPUfreq to the CPU power management section and remove a duplicate include of the main power section.

Quoted 3 lines

This looks fine to me, but since commit addea9ef055b is only in Rafael's next tree, Catalin can't take this, so it makes sense to go through Rafael's tree, right ?

I actually took this patch and noticed that Rafael took it as well. The above commit I think is only valid in the arm64 tree for -next.

Signature · 1 line
Catalin