Merge branch 'timers/urgent' into timers/core

Pick up urgent bug fix and resolve the conflict.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --cc kernel/time/hrtimer.c
index 3d201582630df17fb4b598402f493a8c3b581fbc,aa9d2a2b12109b9f40eb258b37f2c6abf867cdd3..ae0c8a411fe72bba2e98b54408bd86959e7d5093
--- 1/kernel/time/hrtimer.c
--- 2/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@@ -1759,10 -1591,9 +1759,14 @@@ int hrtimers_prepare_cpu(unsigned int c
                timerqueue_init_head(&cpu_base->clock_base[i].active);
        }
  
 -      cpu_base->active_bases = 0;
        cpu_base->cpu = cpu;
 -      hrtimer_init_hres(cpu_base);
++      cpu_base->active_bases = 0;
 +      cpu_base->hres_active = 0;
++      cpu_base->hang_detected = 0;
++      cpu_base->next_timer = NULL;
++      cpu_base->softirq_next_timer = NULL;
 +      cpu_base->expires_next = KTIME_MAX;
 +      cpu_base->softirq_expires_next = KTIME_MAX;
        return 0;
  }