lkml.org 
[lkml]   [2014]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [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



\
 
 \ /
  Last update: 2014-03-27 14:01    [W:0.109 / U:0.472 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site