Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying more...

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

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

diff --cc kernel/sched/deadline.c
index f3d7776656ee302ac56e0ccb6908be1a277787e6,28fa9d9e92012a9245b2e95ce85bf301d320f8cc..b0911797422f05a21b709b8cacaead783a315f8e
--- 1/kernel/sched/deadline.c
--- 2/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@@ -1747,13 -1701,6 +1747,15 @@@ const struct sched_class dl_sched_clas
        .prio_changed           = prio_changed_dl,
        .switched_from          = switched_from_dl,
        .switched_to            = switched_to_dl,
+ 
+       .update_curr            = update_curr_dl,
  };
 +
 +#ifdef CONFIG_SCHED_DEBUG
 +extern void print_dl_rq(struct seq_file *m, int cpu, struct dl_rq *dl_rq);
 +
 +void print_dl_stats(struct seq_file *m, int cpu)
 +{
 +      print_dl_rq(m, cpu, &cpu_rq(cpu)->dl);
 +}
 +#endif /* CONFIG_SCHED_DEBUG */

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

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

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

diff --cc net/core/dev.c
Simple merge