Merge branch 'linus' into timers/core

Resolve semantic conflict in kernel/time/timekeeping.c.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc kernel/time/timekeeping.c
index 5980e90,3447cfa..f045cc5
--- 1/kernel/time/timekeeping.c
--- 2/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@@ -745,6 -717,7 +745,7 @@@ static void timekeeping_resume(void
        timekeeper.clock->cycle_last = timekeeper.clock->read(timekeeper.clock);
        timekeeper.ntp_error = 0;
        timekeeping_suspended = 0;
 -      timekeeping_update(false);
++      timekeeping_update(&timekeeper, false);
        write_sequnlock_irqrestore(&timekeeper.lock, flags);
  
        touch_softlockup_watchdog();