| Message ID | 533D2980.6000903@linaro.org |
|---|---|
| State | New |
| Headers | show |
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. >>> >>> 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 ;) I just noticed Josh's patch half a hour ago, that's why I didn't review it... -- 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/
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.. -- 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/
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 -- 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