Merge branches 'timers/clocksource', 'timers/hpet', 'timers/hrtimers', 'timers/nohz...

diff --cc kernel/posix-timers.c
Simple merge

diff --cc kernel/sched.c
index e4bb1dd7b308fce6f47e736b70425f4bc3482c0a,e4bb1dd7b308fce6f47e736b70425f4bc3482c0a,9b1e79371c207b37c1617d3f7c0460709a3cc39b,5ac5e9536168e47581192fff603bab5f80f33e7a,e4bb1dd7b308fce6f47e736b70425f4bc3482c0a,e4bb1dd7b308fce6f47e736b70425f4bc3482c0a,e4bb1dd7b308fce6f47e736b70425f4bc3482c0a,57c933ffbee1aab4794c30f3690b8188e4ddf02a..22c532a6f82cb9223d682a1b9b21389584b66cc5
--- 1/kernel/sched.c
--- 2/kernel/sched.c
--- 3/kernel/sched.c
--- 4/kernel/sched.c
--- 5/kernel/sched.c
--- 6/kernel/sched.c
--- 7/kernel/sched.c
--- 8/kernel/sched.c
+++ b/kernel/sched.c
@@@@@@@@@ -1453,12 -1453,12 -1453,11 -1451,11 -1453,12 -1453,12 -1453,12 -1445,9 +1451,12 @@@@@@@@@ static int task_hot(struct task_struct 
        static unsigned long cpu_avg_load_per_task(int cpu)
        {
                struct rq *rq = cpu_rq(cpu);
  ++   +        unsigned long nr_running = ACCESS_ONCE(rq->nr_running);
        
  --   -        if (rq->nr_running)
  --   -                rq->avg_load_per_task = rq->load.weight / rq->nr_running;
  ++   +        if (nr_running)
  ++   +                rq->avg_load_per_task = rq->load.weight / nr_running;
       +        else
       +                rq->avg_load_per_task = 0;
        
                return rq->avg_load_per_task;
        }

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