diff mbox

arm64: Fix duplicated Kconfig entries again

Message ID 1395738060-18489-1-git-send-email-hanjun.guo@linaro.org (mailing list archive)
State New, archived
Headers show

Commit Message

Hanjun Guo March 25, 2014, 9 a.m. UTC
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(-)

Comments

Sudeep Holla March 25, 2014, 10 a.m. UTC | #1
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
Hanjun Guo March 25, 2014, 11:09 a.m. UTC | #2
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
>
Sudeep Holla March 27, 2014, 11:12 a.m. UTC | #3
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
Hanjun Guo March 27, 2014, 12:34 p.m. UTC | #4
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
Rafael J. Wysocki March 27, 2014, 3:18 p.m. UTC | #5
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!
diff mbox

Patch

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"