Merge branch 'sched/core'

Conflicts:
	kernel/sched/fair.c

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/debug.c
Simple merge

diff --cc kernel/sched/fair.c
index ddf72c1f97db357383ed190cfbfdb8ddc49b269e,a319d56c760507ec8477c3e7662d11a16fec12b1..50e5793367f8bd0e076f2239dc71fd1b19d04530
--- 1/kernel/sched/fair.c
--- 2/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@@ -5461,8 -5500,7 +6006,10 @@@ static void task_tick_fair(struct rq *r
                entity_tick(cfs_rq, se, queued);
        }
  
+       update_rq_runnable_avg(rq, 1);
++
 +      if (sched_feat_numa(NUMA))
 +              task_tick_numa(rq, curr);
  }
  
  /*

diff --cc kernel/sched/sched.h
Simple merge