Merge branch 'sched/urgent' into sched/core, to resolve conflicts

The following fix in sched/urgent:

  e08d007f9d81 ("sched/debug: Fix avg_vruntime() usage")

is in conflict with this pending commit in sched/core:

  4823725d9d1d ("sched/fair: Increase weight bits for avg_vruntime")

Both modify the same variable definition and initialization blocks,
resolve it by merging the two.

 Conflicts:
	kernel/sched/debug.c

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

diff --cc MAINTAINERS
Simple merge

diff --cc kernel/sched/debug.c
index 6246008c431e633676195eaee306c6594405a8f7,15bf45b6f912412647f8c8a4b6593f2dfe22486e..74c1617cf65234cc78bd98ec70eecc0e8bccf83f
--- 1/kernel/sched/debug.c
--- 2/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@@ -902,13 -901,11 +902,14 @@@ static void print_rq(struct seq_file *m
  
  void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
  {
 -      s64 left_vruntime = -1, zero_vruntime, right_vruntime = -1, left_deadline = -1, spread;
 +      s64 left_vruntime = -1, right_vruntime = -1, left_deadline = -1, spread;
 +      s64 zero_vruntime = -1, sum_w_vruntime = -1;
+       u64 avruntime;
        struct sched_entity *last, *first, *root;
        struct rq *rq = cpu_rq(cpu);
 +      unsigned int sum_shift;
        unsigned long flags;
 +      u64 sum_weight;
  
  #ifdef CONFIG_FAIR_GROUP_SCHED
        SEQ_printf(m, "\n");
@@@ -929,9 -926,7 +930,10 @@@
        if (last)
                right_vruntime = last->vruntime;
        zero_vruntime = cfs_rq->zero_vruntime;
 +      sum_w_vruntime = cfs_rq->sum_w_vruntime;
 +      sum_weight = cfs_rq->sum_weight;
 +      sum_shift = cfs_rq->sum_shift;
+       avruntime = avg_vruntime(cfs_rq);
        raw_spin_rq_unlock_irqrestore(rq, flags);
  
        SEQ_printf(m, "  .%-30s: %Ld.%06ld\n", "left_deadline",
@@@ -940,13 -935,8 +942,13 @@@
                        SPLIT_NS(left_vruntime));
        SEQ_printf(m, "  .%-30s: %Ld.%06ld\n", "zero_vruntime",
                        SPLIT_NS(zero_vruntime));
 +      SEQ_printf(m, "  .%-30s: %Ld (%d bits)\n", "sum_w_vruntime",
 +                 sum_w_vruntime, ilog2(abs(sum_w_vruntime)));
 +      SEQ_printf(m, "  .%-30s: %Lu\n", "sum_weight",
 +                 sum_weight);
 +      SEQ_printf(m, "  .%-30s: %u\n", "sum_shift", sum_shift);
        SEQ_printf(m, "  .%-30s: %Ld.%06ld\n", "avg_vruntime",
-                       SPLIT_NS(avg_vruntime(cfs_rq)));
+                       SPLIT_NS(avruntime));
        SEQ_printf(m, "  .%-30s: %Ld.%06ld\n", "right_vruntime",
                        SPLIT_NS(right_vruntime));
        spread = right_vruntime - left_vruntime;

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