Message-ID: <51FBA21D.5010308@linaro.org>
Date: Fri, 02 Aug 2013 14:12:13 +0200
From: Daniel Lezcano <daniel.lezcano@linaro.org>
User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130510 Thunderbird/17.0.6
MIME-Version: 1.0
To: Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@arm.com>
CC: "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
References: <1371575223-21702-1-git-send-email-Sudeep.KarkadaNagesha@arm.com> <1374492082-13686-1-git-send-email-Sudeep.KarkadaNagesha@arm.com> <51FB7CB8.6080103@arm.com> <51FB8081.6040501@linaro.org> <51FB81FB.3060709@arm.com>
In-Reply-To: <51FB81FB.3060709@arm.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1663
Lines: 40

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.


-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/