* [PATCH] arm64: Fix duplicated Kconfig entries
@ 2014-03-11 13:17 Mark Brown
2014-03-11 13:59 ` Sudeep Holla
0 siblings, 1 reply; 3+ messages in thread
From: Mark Brown @ 2014-03-11 13:17 UTC (permalink / raw)
To: linux-arm-kernel
From: Mark Brown <broonie@linaro.org>
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 <broonie@linaro.org>
---
arch/arm64/Kconfig | 6 ------
1 file changed, 6 deletions(-)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index a3c40d65128b..2474c24dc229 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -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
--
1.9.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] arm64: Fix duplicated Kconfig entries
2014-03-11 13:17 [PATCH] arm64: Fix duplicated Kconfig entries Mark Brown
@ 2014-03-11 13:59 ` Sudeep Holla
2014-03-12 17:19 ` Catalin Marinas
0 siblings, 1 reply; 3+ messages in thread
From: Sudeep Holla @ 2014-03-11 13:59 UTC (permalink / raw)
To: linux-arm-kernel
Hi Mark,
On 11/03/14 13:17, Mark Brown wrote:
> From: Mark Brown <broonie@linaro.org>
>
> 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
> Signed-off-by: Mark Brown <broonie@linaro.org>
> ---
> arch/arm64/Kconfig | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
> index a3c40d65128b..2474c24dc229 100644
> --- a/arch/arm64/Kconfig
> +++ b/arch/arm64/Kconfig
> @@ -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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] arm64: Fix duplicated Kconfig entries
2014-03-11 13:59 ` Sudeep Holla
@ 2014-03-12 17:19 ` Catalin Marinas
0 siblings, 0 replies; 3+ messages in thread
From: Catalin Marinas @ 2014-03-12 17:19 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Mar 11, 2014 at 01:59:34PM +0000, Sudeep Holla wrote:
> On 11/03/14 13:17, Mark Brown wrote:
> > From: Mark Brown <broonie@linaro.org>
> >
> > 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 ?
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.
--
Catalin
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-03-12 17:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-11 13:17 [PATCH] arm64: Fix duplicated Kconfig entries Mark Brown
2014-03-11 13:59 ` Sudeep Holla
2014-03-12 17:19 ` Catalin Marinas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).