From: Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@arm.com>
To: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@arm.com>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Mark Rutland <Mark.Rutland@arm.com>,
Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>,
Russell King <linux@arm.linux.org.uk>,
Catalin Marinas <Catalin.Marinas@arm.com>,
Will Deacon <Will.Deacon@arm.com>
Subject: Re: [PATCH v2 0/3] ARM/ARM64 architected timer updates
Date: Tue, 06 Aug 2013 10:01:49 +0100 [thread overview]
Message-ID: <5200BB7D.3020501@arm.com> (raw)
In-Reply-To: <5200AF41.7090405@linaro.org>
On 06/08/13 09:09, Daniel Lezcano wrote:
> On 08/05/2013 06:25 PM, Sudeep KarkadaNagesha wrote:
>> Hi Daniel,
>>
>> On 02/08/13 13:12, Daniel Lezcano wrote:
>>> On 08/02/2013 11:55 AM, Sudeep KarkadaNagesha wrote:
>>>> On 02/08/13 10:48, Daniel Lezcano wrote:
>>>>> On 08/02/2013 11:32 AM, Sudeep KarkadaNagesha wrote:
>>>>>> Hi Daniel,
>>>>>>
>>>>>> On 22/07/13 12:21, Sudeep KarkadaNagesha wrote:
>>>>>>> From: Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
>>>>>>>
>>>>>>> This patch series adds support to configure the rate and enable the event
>>>>>>> stream for architected timer. Since the timer control register is reset to
>>>>>>> zero on warm boot, CPU PM notifier is added to re-initialse it.
>>>>>>>
>>>>>> This series is required to support TC2 cpuidle.
>>>>>> It will be good if you can review and get this in for v3.12
>>>>>
>>>>> So do you want me to take the series through my tree ?
>>>>>
>>>> Yes I believe it has to go through your(ARM specific clocksource?) tree,
>>>> but currently there's a conflict with another bug fix(that should come
>>>> from rmk as -rc fix)
>>>> (Commit ab8d46c0 "ARM: 7788/1: elf: fix lpae hwcap feature reporting in
>>>> proc/cpuinfo" in rmk -fixes)
>>>
>>> IMO, you should rebase this patch on top of tips/core, I will apply the
>>> series and when the rmk fix hits this branch (through tips/urgent), that
>>> will be up to the maintainer to resolve this conflict.
>>>
>>
>> The fix with which this series was conflicting is already in v3.11-rc4
>> So can I send pull request based on v3.11-rc4 or if you prefer any
>> particular tree, can you provide details please ?
>
> Ok, I will ping Thomas to update the tips/core branch to 3.11-rc4.
>
Thanks Daniel, will send pull request once it's updated.
Regards
Sudeep
next prev parent reply other threads:[~2013-08-06 9:01 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-18 17:06 [PATCH 0/4] ARM/ARM64 architected timer updates Sudeep KarkadaNagesha
2013-06-18 17:07 ` [PATCH 1/4] drivers: clocksource: configure event stream for ARM arch timer Sudeep KarkadaNagesha
2013-06-18 17:07 ` [PATCH 2/4] ARM: arch_timer: add macros for bits in control register Sudeep KarkadaNagesha
2013-06-18 17:07 ` [PATCH 3/4] ARM/ARM64: arch_timer: remove __cpuinit attribute for arch_counter_set_user_access Sudeep KarkadaNagesha
2013-06-18 17:58 ` Sudeep KarkadaNagesha
2013-06-18 17:07 ` [PATCH 4/4] drivers: clocksource: add CPU PM notifier for ARM architected timer Sudeep KarkadaNagesha
2013-07-02 16:09 ` Jon Medhurst (Tixy)
2013-07-02 17:24 ` Sudeep KarkadaNagesha
2013-07-22 11:21 ` [PATCH v2 0/3] ARM/ARM64 architected timer updates Sudeep KarkadaNagesha
2013-07-22 11:21 ` [PATCH v2 1/3] drivers: clocksource: configure event stream for ARM arch timer Sudeep KarkadaNagesha
2013-07-23 10:23 ` Catalin Marinas
2013-07-23 10:33 ` Will Deacon
2013-07-23 11:12 ` Catalin Marinas
2013-07-25 9:45 ` [PATCH v3 " Sudeep KarkadaNagesha
2013-08-12 13:32 ` Sudeep KarkadaNagesha
2013-07-22 11:21 ` [PATCH v2 2/3] ARM: arch_timer: add macros for bits in control register Sudeep KarkadaNagesha
2013-07-22 11:21 ` [PATCH v2 3/3] drivers: clocksource: add CPU PM notifier for ARM architected timer Sudeep KarkadaNagesha
2013-08-02 9:32 ` [PATCH v2 0/3] ARM/ARM64 architected timer updates Sudeep KarkadaNagesha
2013-08-02 9:48 ` Daniel Lezcano
2013-08-02 9:55 ` Sudeep KarkadaNagesha
2013-08-02 12:12 ` Daniel Lezcano
2013-08-05 16:25 ` Sudeep KarkadaNagesha
2013-08-06 8:09 ` Daniel Lezcano
2013-08-06 9:01 ` Sudeep KarkadaNagesha [this message]
2013-08-12 13:16 ` Daniel Lezcano
2013-08-13 17:29 ` [PATCH v3 0/6] " Sudeep KarkadaNagesha
2013-08-13 17:29 ` [PATCH v3 1/6] ARM/ARM64: arch_timer: add macros for bits in control register Sudeep KarkadaNagesha
2013-08-14 8:50 ` Daniel Lezcano
2013-08-14 9:03 ` Marc Zyngier
2013-08-14 9:23 ` Daniel Lezcano
2013-08-13 17:29 ` [PATCH v3 2/6] drivers: clocksource: configure event stream for ARM arch timer Sudeep KarkadaNagesha
2013-08-13 17:29 ` [PATCH v3 3/6] ARM: arch_timer: configure and enable event stream Sudeep KarkadaNagesha
2013-08-13 17:29 ` [PATCH v3 4/6] ARM64: " Sudeep KarkadaNagesha
2013-08-20 13:27 ` Will Deacon
2013-08-20 14:27 ` Sudeep KarkadaNagesha
2013-08-20 16:16 ` Will Deacon
2013-08-20 16:23 ` Sudeep KarkadaNagesha
2013-08-20 17:08 ` Sudeep KarkadaNagesha
2013-08-21 17:52 ` Will Deacon
2013-08-13 17:29 ` [PATCH v3 5/6] drivers: clocksource: enable hwcaps for event stream on ARM arch timer Sudeep KarkadaNagesha
2013-08-13 17:29 ` [PATCH v3 6/6] drivers: clocksource: add CPU PM notifier for ARM architected timer Sudeep KarkadaNagesha
2013-08-14 9:08 ` [PATCH v3 0/6] ARM/ARM64 architected timer updates Daniel Lezcano
2013-08-14 9:17 ` Sudeep KarkadaNagesha
2013-08-14 10:51 ` Daniel Lezcano
2013-08-14 11:03 ` Sudeep KarkadaNagesha
2013-08-14 15:00 ` Daniel Lezcano
2013-08-20 17:14 ` Sudeep KarkadaNagesha
2013-08-23 9:26 ` Catalin Marinas
2013-08-23 9:57 ` Sudeep KarkadaNagesha
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=5200BB7D.3020501@arm.com \
--to=sudeep.karkadanagesha@arm.com \
--cc=Catalin.Marinas@arm.com \
--cc=Lorenzo.Pieralisi@arm.com \
--cc=Mark.Rutland@arm.com \
--cc=Will.Deacon@arm.com \
--cc=daniel.lezcano@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).