Merge branch 'fortglx/4.15/time' of https://git.linaro.org/people/john.stultz/linux...

Pull timekeeping updates from John Stultz:

 - More y2038 work from Arnd Bergmann

 - A new mechanism to allow RTC drivers to specify the resolution of the
   RTC so the suspend/resume code can make informed decisions whether to
   inject the suspended time or not in case of fast suspend/resume cycles.

diff --cc include/linux/timekeeping.h
index eb98cbdbb32322ab7310b87dad06697a6c55ea89,405beea4e71bfd05af2f9624b505c4ede22d7721..2263698edeafa6d61f499531cdf62e9249540761
--- 1/include/linux/timekeeping.h
--- 2/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
@@@ -239,16 -118,10 +118,11 @@@ static inline u64 ktime_get_raw_ns(void
  extern u64 ktime_get_mono_fast_ns(void);
  extern u64 ktime_get_raw_fast_ns(void);
  extern u64 ktime_get_boot_fast_ns(void);
 +extern u64 ktime_get_real_fast_ns(void);
  
  /*
-  * Timespec interfaces utilizing the ktime based ones
+  * timespec64 interfaces utilizing the ktime based ones
   */
- static inline void get_monotonic_boottime(struct timespec *ts)
- {
-       *ts = ktime_to_timespec(ktime_get_boottime());
- }
- 
  static inline void get_monotonic_boottime64(struct timespec64 *ts)
  {
        *ts = ktime_to_timespec64(ktime_get_boottime());

diff --cc kernel/time/time.c
Simple merge

diff --cc kernel/time/timekeeping.c
Simple merge