Merge 4.16-rc6 into tty-next

We want the serial/tty fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 6 insertions, 0 deletions

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 48150ab42de9..4a4fd567fb26 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1894,6 +1894,12 @@ int timers_dead_cpu(unsigned int cpu)
                 raw_spin_lock_irq(&new_base->lock);
                 raw_spin_lock_nested(&old_base->lock, SINGLE_DEPTH_NESTING);
 
+                /*
+                 * The current CPUs base clock might be stale. Update it
+                 * before moving the timers over.
+                 */
+                forward_timer_base(new_base);
+
                 BUG_ON(old_base->running_timer);
 
                 for (i = 0; i < WHEEL_SIZE; i++)