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.karkadanage...@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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
