From: hanjun.guo@linaro•org (Hanjun Guo)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] arm64: Fix duplicated Kconfig entries again
Date: Thu, 27 Mar 2014 20:34:39 +0800 [thread overview]
Message-ID: <53341ADF.2050904@linaro.org> (raw)
In-Reply-To: <5334078A.9010408@arm.com>
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
next prev parent reply other threads:[~2014-03-27 12:34 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-25 9:00 [PATCH] arm64: Fix duplicated Kconfig entries again Hanjun Guo
2014-03-25 10:00 ` [Linaro-acpi] " Sudeep Holla
2014-03-25 11:09 ` Hanjun Guo
2014-03-27 11:12 ` Sudeep Holla
2014-03-27 12:34 ` Hanjun Guo [this message]
2014-03-27 15:18 ` Rafael J. Wysocki
2014-04-03 8:35 ` Hanjun Guo
2014-04-03 8:41 ` Viresh Kumar
2014-04-03 8:51 ` Catalin Marinas
2014-04-03 9:27 ` Hanjun Guo
2014-04-03 9:30 ` Hanjun Guo
2014-04-03 9:38 ` Viresh Kumar
2014-04-03 11:01 ` Hanjun Guo
[not found] <CA+5PVA6awqaSHQboqdv9nynV9Xjp46VeqijDWxZX1v5wDK0NWQ@mail.gmail.com>
2014-04-02 5:06 ` arm64/cqufreq Kconfig error with v3.14-3893-gc12e69c6aaf7 Viresh Kumar
2014-04-02 14:40 ` [PATCH] arm64: Fix duplicated Kconfig entries again Josh Boyer
2014-04-03 4:23 ` Viresh Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53341ADF.2050904@linaro.org \
--to=hanjun.guo@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox