Re: [PATCH] arm64: Fix duplicated Kconfig entries again
On 2014-4-3 17:38, Viresh Kumar wrote: > On 3 April 2014 14:57, Hanjun Guo 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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
On 3 April 2014 14:57, Hanjun Guo 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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
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 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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
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 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 ;) 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
On Thu, Apr 03, 2014 at 09:41:57AM +0100, Viresh Kumar wrote: > On Thu, Apr 3, 2014 at 2:05 PM, Hanjun Guo 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 ;) -- Catalin -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
On Thu, Apr 3, 2014 at 2:05 PM, Hanjun Guo wrote: > How about the following patch? if it is ok, I will resend it. http://www.spinics.net/lists/arm-kernel/msg319545.html -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
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 --- 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" -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
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@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 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
On Thu, Apr 3, 2014 at 2:05 PM, Hanjun Guo hanjun@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 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
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@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 ;) -- Catalin -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
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@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 ;) 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 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
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@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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
On 3 April 2014 14:57, Hanjun Guo hanjun@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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
On 2014-4-3 17:38, Viresh Kumar wrote: On 3 April 2014 14:57, Hanjun Guo hanjun@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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
On Wed, Apr 2, 2014 at 8:10 PM, Josh Boyer wrote: > Commit 74397174989e5f70 attempted to clean up the power management options > for arm64, but when things were merged it didn't fully take effect. Fix > it again. > > Signed-off-by: Josh Boyer > --- > arch/arm64/Kconfig | 6 -- > 1 file changed, 6 deletions(-) > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index 07aa3556952c..8033b9b8a2df 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -321,12 +321,6 @@ 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" Reviewed-by: Viresh Kumar -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] arm64: Fix duplicated Kconfig entries again
Commit 74397174989e5f70 attempted to clean up the power management options for arm64, but when things were merged it didn't fully take effect. Fix it again. Signed-off-by: Josh Boyer --- arch/arm64/Kconfig | 6 -- 1 file changed, 6 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 07aa3556952c..8033b9b8a2df 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -321,12 +321,6 @@ 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" -- 1.8.5.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] arm64: Fix duplicated Kconfig entries again
Commit 74397174989e5f70 attempted to clean up the power management options for arm64, but when things were merged it didn't fully take effect. Fix it again. Signed-off-by: Josh Boyer jwbo...@fedoraproject.org --- arch/arm64/Kconfig | 6 -- 1 file changed, 6 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 07aa3556952c..8033b9b8a2df 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -321,12 +321,6 @@ 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 -- 1.8.5.3 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
On Wed, Apr 2, 2014 at 8:10 PM, Josh Boyer jwbo...@fedoraproject.org wrote: Commit 74397174989e5f70 attempted to clean up the power management options for arm64, but when things were merged it didn't fully take effect. Fix it again. Signed-off-by: Josh Boyer jwbo...@fedoraproject.org --- arch/arm64/Kconfig | 6 -- 1 file changed, 6 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 07aa3556952c..8033b9b8a2df 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -321,12 +321,6 @@ 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 Reviewed-by: Viresh Kumar viresh.ku...@linaro.org -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
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. > >> [...] > >>> [1] http://www.spinics.net/lists/arm-kernel/msg314472.html > > > > [...] > > > >> here is the link: > >> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/arch/arm64/Kconfig > >> > > > > 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! -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
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. >> [...] >>> [1] http://www.spinics.net/lists/arm-kernel/msg314472.html > > [...] > >> here is the link: >> https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/arch/arm64/Kconfig >> > > 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
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. > [...] >> [1] http://www.spinics.net/lists/arm-kernel/msg314472.html [...] > here is the link: > https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/arch/arm64/Kconfig > 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
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. [...] [1] http://www.spinics.net/lists/arm-kernel/msg314472.html [...] here is the link: https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/arch/arm64/Kconfig 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 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
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. [...] [1] http://www.spinics.net/lists/arm-kernel/msg314472.html [...] here is the link: https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/arch/arm64/Kconfig 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 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
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. [...] [1] http://www.spinics.net/lists/arm-kernel/msg314472.html [...] here is the link: https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/arch/arm64/Kconfig 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! -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
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. [...] > [1] http://www.spinics.net/lists/arm-kernel/msg314472.html 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/arm64/Kconfig Thanks Hanjun > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [Linaro-acpi] [PATCH] arm64: Fix duplicated Kconfig entries again
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 [1] http://www.spinics.net/lists/arm-kernel/msg314472.html -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] arm64: Fix duplicated Kconfig entries again
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 --- 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" -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] arm64: Fix duplicated Kconfig entries again
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@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 -- 1.7.9.5 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [Linaro-acpi] [PATCH] arm64: Fix duplicated Kconfig entries again
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 [1] http://www.spinics.net/lists/arm-kernel/msg314472.html -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] arm64: Fix duplicated Kconfig entries again
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. [...] [1] http://www.spinics.net/lists/arm-kernel/msg314472.html 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/arm64/Kconfig Thanks Hanjun -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
