* [PATCH] arm64: Fix duplicated Kconfig entries again @ 2014-03-25 9:00 ` Hanjun Guo 0 siblings, 0 replies; 26+ messages in thread From: Hanjun Guo @ 2014-03-25 9:00 UTC (permalink / raw) To: linux-arm-kernel 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" -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH] arm64: Fix duplicated Kconfig entries again @ 2014-03-25 9:00 ` Hanjun Guo 0 siblings, 0 replies; 26+ messages in thread From: Hanjun Guo @ 2014-03-25 9:00 UTC (permalink / raw) To: Catalin Marinas, Will Deacon Cc: Mark Brown, linux-kernel, linux-arm-kernel, linaro-acpi, Hanjun Guo 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" -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [Linaro-acpi] [PATCH] arm64: Fix duplicated Kconfig entries again 2014-03-25 9:00 ` Hanjun Guo @ 2014-03-25 10:00 ` Sudeep Holla -1 siblings, 0 replies; 26+ messages in thread From: Sudeep Holla @ 2014-03-25 10:00 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [Linaro-acpi] [PATCH] arm64: Fix duplicated Kconfig entries again @ 2014-03-25 10:00 ` Sudeep Holla 0 siblings, 0 replies; 26+ messages in thread From: Sudeep Holla @ 2014-03-25 10:00 UTC (permalink / raw) To: Hanjun Guo, Catalin Marinas, Will Deacon Cc: Sudeep Holla, linaro-acpi@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mark Brown 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH] arm64: Fix duplicated Kconfig entries again 2014-03-25 10:00 ` Sudeep Holla @ 2014-03-25 11:09 ` Hanjun Guo -1 siblings, 0 replies; 26+ messages in thread From: Hanjun Guo @ 2014-03-25 11:09 UTC (permalink / raw) To: linux-arm-kernel 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 > ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH] arm64: Fix duplicated Kconfig entries again @ 2014-03-25 11:09 ` Hanjun Guo 0 siblings, 0 replies; 26+ messages in thread From: Hanjun Guo @ 2014-03-25 11:09 UTC (permalink / raw) To: Sudeep Holla, Catalin Marinas, Will Deacon Cc: linaro-acpi@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mark Brown 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 > ^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH] arm64: Fix duplicated Kconfig entries again 2014-03-25 11:09 ` Hanjun Guo @ 2014-03-27 11:12 ` Sudeep Holla -1 siblings, 0 replies; 26+ messages in thread From: Sudeep Holla @ 2014-03-27 11:12 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH] arm64: Fix duplicated Kconfig entries again @ 2014-03-27 11:12 ` Sudeep Holla 0 siblings, 0 replies; 26+ messages in thread From: Sudeep Holla @ 2014-03-27 11:12 UTC (permalink / raw) To: Hanjun Guo, Catalin Marinas, Will Deacon Cc: Sudeep Holla, linaro-acpi@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mark Brown, Rafael J. Wysocki 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH] arm64: Fix duplicated Kconfig entries again 2014-03-27 11:12 ` Sudeep Holla @ 2014-03-27 12:34 ` Hanjun Guo -1 siblings, 0 replies; 26+ messages in thread From: Hanjun Guo @ 2014-03-27 12:34 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH] arm64: Fix duplicated Kconfig entries again @ 2014-03-27 12:34 ` Hanjun Guo 0 siblings, 0 replies; 26+ messages in thread From: Hanjun Guo @ 2014-03-27 12:34 UTC (permalink / raw) To: Sudeep Holla, Catalin Marinas, Will Deacon Cc: linaro-acpi@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mark Brown, Rafael J. Wysocki 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH] arm64: Fix duplicated Kconfig entries again 2014-03-27 12:34 ` Hanjun Guo @ 2014-03-27 15:18 ` Rafael J. Wysocki -1 siblings, 0 replies; 26+ messages in thread From: Rafael J. Wysocki @ 2014-03-27 15:18 UTC (permalink / raw) To: linux-arm-kernel 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. ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH] arm64: Fix duplicated Kconfig entries again @ 2014-03-27 15:18 ` Rafael J. Wysocki 0 siblings, 0 replies; 26+ messages in thread From: Rafael J. Wysocki @ 2014-03-27 15:18 UTC (permalink / raw) To: Hanjun Guo Cc: Sudeep Holla, Catalin Marinas, Will Deacon, linaro-acpi@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mark Brown 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. ^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH] arm64: Fix duplicated Kconfig entries again 2014-03-27 15:18 ` Rafael J. Wysocki @ 2014-04-03 8:35 ` Hanjun Guo -1 siblings, 0 replies; 26+ messages in thread From: Hanjun Guo @ 2014-04-03 8:35 UTC (permalink / raw) To: linux-arm-kernel 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" ^ permalink raw reply related [flat|nested] 26+ messages in thread
* Re: [PATCH] arm64: Fix duplicated Kconfig entries again @ 2014-04-03 8:35 ` Hanjun Guo 0 siblings, 0 replies; 26+ messages in thread From: Hanjun Guo @ 2014-04-03 8:35 UTC (permalink / raw) To: Rafael J. Wysocki Cc: Sudeep Holla, Catalin Marinas, Will Deacon, linaro-acpi@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mark Brown 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" ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH] arm64: Fix duplicated Kconfig entries again 2014-04-03 8:35 ` Hanjun Guo @ 2014-04-03 8:41 ` Viresh Kumar -1 siblings, 0 replies; 26+ messages in thread From: Viresh Kumar @ 2014-04-03 8:41 UTC (permalink / raw) To: linux-arm-kernel 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH] arm64: Fix duplicated Kconfig entries again @ 2014-04-03 8:41 ` Viresh Kumar 0 siblings, 0 replies; 26+ messages in thread From: Viresh Kumar @ 2014-04-03 8:41 UTC (permalink / raw) To: Hanjun Guo Cc: Rafael J. Wysocki, linaro-acpi@lists.linaro.org, Catalin Marinas, Mark Brown, Will Deacon, linux-kernel@vger.kernel.org, Sudeep Holla, linux-arm-kernel@lists.infradead.org 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH] arm64: Fix duplicated Kconfig entries again 2014-04-03 8:41 ` Viresh Kumar @ 2014-04-03 8:51 ` Catalin Marinas -1 siblings, 0 replies; 26+ messages in thread From: Catalin Marinas @ 2014-04-03 8:51 UTC (permalink / raw) To: linux-arm-kernel 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 ;) -- Catalin ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH] arm64: Fix duplicated Kconfig entries again @ 2014-04-03 8:51 ` Catalin Marinas 0 siblings, 0 replies; 26+ messages in thread From: Catalin Marinas @ 2014-04-03 8:51 UTC (permalink / raw) To: Viresh Kumar Cc: hanjun.guo@linaro.org, Rafael J. Wysocki, linaro-acpi@lists.linaro.org, Mark Brown, Will Deacon, linux-kernel@vger.kernel.org, Sudeep Holla, linux-arm-kernel@lists.infradead.org, Josh Boyer 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 ;) -- Catalin ^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH] arm64: Fix duplicated Kconfig entries again 2014-04-03 8:51 ` Catalin Marinas @ 2014-04-03 9:27 ` Hanjun Guo -1 siblings, 0 replies; 26+ messages in thread From: Hanjun Guo @ 2014-04-03 9:27 UTC (permalink / raw) To: linux-arm-kernel 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 ;) 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 at 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 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* Re: [PATCH] arm64: Fix duplicated Kconfig entries again @ 2014-04-03 9:27 ` Hanjun Guo 0 siblings, 0 replies; 26+ messages in thread From: Hanjun Guo @ 2014-04-03 9:27 UTC (permalink / raw) To: Catalin Marinas, Viresh Kumar Cc: Rafael J. Wysocki, linaro-acpi@lists.linaro.org, Mark Brown, Will Deacon, linux-kernel@vger.kernel.org, Sudeep Holla, linux-arm-kernel@lists.infradead.org, Josh Boyer 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 ;) 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 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH] arm64: Fix duplicated Kconfig entries again 2014-04-03 9:27 ` Hanjun Guo @ 2014-04-03 9:30 ` Hanjun Guo -1 siblings, 0 replies; 26+ messages in thread From: Hanjun Guo @ 2014-04-03 9:30 UTC (permalink / raw) To: linux-arm-kernel 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... ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH] arm64: Fix duplicated Kconfig entries again @ 2014-04-03 9:30 ` Hanjun Guo 0 siblings, 0 replies; 26+ messages in thread From: Hanjun Guo @ 2014-04-03 9:30 UTC (permalink / raw) To: Catalin Marinas, Viresh Kumar Cc: Rafael J. Wysocki, linaro-acpi@lists.linaro.org, Mark Brown, Will Deacon, linux-kernel@vger.kernel.org, Sudeep Holla, linux-arm-kernel@lists.infradead.org, Josh Boyer 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... ^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH] arm64: Fix duplicated Kconfig entries again 2014-04-03 9:27 ` Hanjun Guo @ 2014-04-03 9:38 ` Viresh Kumar -1 siblings, 0 replies; 26+ messages in thread From: Viresh Kumar @ 2014-04-03 9:38 UTC (permalink / raw) To: linux-arm-kernel 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 at 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.. ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH] arm64: Fix duplicated Kconfig entries again @ 2014-04-03 9:38 ` Viresh Kumar 0 siblings, 0 replies; 26+ messages in thread From: Viresh Kumar @ 2014-04-03 9:38 UTC (permalink / raw) To: Hanjun Guo Cc: Catalin Marinas, Rafael J. Wysocki, linaro-acpi@lists.linaro.org, Mark Brown, Will Deacon, linux-kernel@vger.kernel.org, Sudeep Holla, linux-arm-kernel@lists.infradead.org, Josh Boyer 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.. ^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH] arm64: Fix duplicated Kconfig entries again 2014-04-03 9:38 ` Viresh Kumar @ 2014-04-03 11:01 ` Hanjun Guo -1 siblings, 0 replies; 26+ messages in thread From: Hanjun Guo @ 2014-04-03 11:01 UTC (permalink / raw) To: linux-arm-kernel 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 at 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH] arm64: Fix duplicated Kconfig entries again @ 2014-04-03 11:01 ` Hanjun Guo 0 siblings, 0 replies; 26+ messages in thread From: Hanjun Guo @ 2014-04-03 11:01 UTC (permalink / raw) To: Viresh Kumar Cc: Catalin Marinas, Rafael J. Wysocki, linaro-acpi@lists.linaro.org, Mark Brown, Will Deacon, linux-kernel@vger.kernel.org, Sudeep Holla, linux-arm-kernel@lists.infradead.org, Josh Boyer 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
end of thread, other threads:[~2014-04-03 11:02 UTC | newest] Thread overview: 26+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-03-25 9:00 [PATCH] arm64: Fix duplicated Kconfig entries again Hanjun Guo 2014-03-25 9:00 ` Hanjun Guo 2014-03-25 10:00 ` [Linaro-acpi] " Sudeep Holla 2014-03-25 10:00 ` Sudeep Holla 2014-03-25 11:09 ` Hanjun Guo 2014-03-25 11:09 ` Hanjun Guo 2014-03-27 11:12 ` Sudeep Holla 2014-03-27 11:12 ` Sudeep Holla 2014-03-27 12:34 ` Hanjun Guo 2014-03-27 12:34 ` Hanjun Guo 2014-03-27 15:18 ` Rafael J. Wysocki 2014-03-27 15:18 ` Rafael J. Wysocki 2014-04-03 8:35 ` Hanjun Guo 2014-04-03 8:35 ` Hanjun Guo 2014-04-03 8:41 ` Viresh Kumar 2014-04-03 8:41 ` Viresh Kumar 2014-04-03 8:51 ` Catalin Marinas 2014-04-03 8:51 ` Catalin Marinas 2014-04-03 9:27 ` Hanjun Guo 2014-04-03 9:27 ` Hanjun Guo 2014-04-03 9:30 ` Hanjun Guo 2014-04-03 9:30 ` Hanjun Guo 2014-04-03 9:38 ` Viresh Kumar 2014-04-03 9:38 ` Viresh Kumar 2014-04-03 11:01 ` Hanjun Guo 2014-04-03 11:01 ` Hanjun Guo
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.