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.
[...]
[...]
here is the link: https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/arch/a...
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