The following changes since commit c6bb11147eb09bd39f316c6062455b88c905ab6e:
Merge branch 'fortglx/4.19/time' of https://git.linaro.org/people/john.stultz/linux into timers/core (2018-07-12 22:19:58 +0200) are available in the git repository at: https://git.linaro.org/people/john.stultz/linux.git tags/fortglx/4.19/time-part2 for you to fetch changes up to 39232ed5a1793f67b11430c43ed8a9ed6e96c6eb: time: Introduce one suspend clocksource to compensate the suspend time (2018-07-19 17:08:52 -0700) ---------------------------------------------------------------- Just a second set of timekeeping things for 4.19 * NTP argument clenaups and constification from Ondrej Mosnacek * Fix to avoid RTC injecting sleeptime when suspend fails from Mukesh Ojha * Broading suspsend-timing to include non-stop clocksources that aren't currently used for timekeeping from Baolin Wang Cc: Thomas Gleixner <t...@linutronix.de> Cc: Ingo Molnar <mi...@kernel.org> Cc: Miroslav Lichvar <mlich...@redhat.com> Cc: Richard Cochran <richardcoch...@gmail.com> Cc: Prarit Bhargava <pra...@redhat.com> Cc: Stephen Boyd <sb...@kernel.org> Cc: Ondrej Mosnacek <omosn...@redhat.com> Cc: Mukesh Ojha <mo...@codeaurora.org> Cc: Baolin Wang <baolin.w...@linaro.org> CC: Daniel Lezcano <daniel.lezc...@linaro.org> ---------------------------------------------------------------- Baolin Wang (1): time: Introduce one suspend clocksource to compensate the suspend time Mukesh Ojha (1): time: Fix extra sleeptime injection when suspend fails Ondrej Mosnacek (3): ntp: Remove redundant arguments ntp: Use kstrtos64 for s64 variable timekeeping/ntp: Constify some function arguments include/linux/clocksource.h | 3 ++ include/linux/timekeeping.h | 2 +- kernel/time/clocksource.c | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ kernel/time/ntp.c | 17 +++++------ kernel/time/ntp_internal.h | 4 +-- kernel/time/timekeeping.c | 83 +++++++++++++++++++++++++++++++++------------------ kernel/time/timekeeping_debug.c | 2 +- kernel/time/timekeeping_internal.h | 2 +- 8 files changed, 218 insertions(+), 44 deletions(-) -- 2.7.4
