* Daniel Lezcano <daniel.lezc...@linaro.org> wrote:

> Hi Ingo, Thomas,
> 
> The pull request contains the following fixes for 4.13-rc4
> 
>  - Fix error check against IS_ERR() instead of NULL for the timer-of code
>    (Dan Carpenter)
> 
>  - Fix infinite recusion with ftrace for the ARM architected timer (Ding
>    Tianhong)
> 
>  - Fix the error code return in the em_sti's probe function (Gustavo A. R.
>    Silva)
> 
>  - Fix Kconfig dependency for the pistachio driver (Matt Redfearn).
> 
>  - Fix mem frame loop initialization for the ARM architected timer (Matthias
>    Kaehlcke)

>  arch/arm64/include/asm/arch_timer.h  |  4 ++--
>  drivers/clocksource/Kconfig          |  2 +-
>  drivers/clocksource/arm_arch_timer.c |  2 +-
>  drivers/clocksource/em_sti.c         | 11 ++++++-----
>  drivers/clocksource/timer-of.c       |  4 ++--
>  5 files changed, 12 insertions(+), 11 deletions(-)

Pulled into tip:timers/urgent, thanks Daniel!

        Ingo

Reply via email to