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

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

diff --cc drivers/block/loop.c
Simple merge

diff --cc drivers/block/nbd.c
Simple merge

diff --cc drivers/char/ipmi/ipmi_si_intf.c
Simple merge

diff --cc drivers/scsi/bnx2fc/bnx2fc_fcoe.c
Simple merge

diff --cc drivers/scsi/fcoe/fcoe.c
Simple merge

diff --cc kernel/sched/fair.c
index 43232b8,0fdb96d..5d859ec
--- 1/kernel/sched/fair.c
--- 2/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@@ -6727,12 -6725,12 +6730,9 @@@ static int idle_balance(struct rq *this
                this_rq->next_balance = next_balance;
        }
  
-       if (curr_cost > this_rq->max_idle_balance_cost)
-               this_rq->max_idle_balance_cost = curr_cost;
- 
  out:
        /* Is there a task of a high priority class? */
 -      if (this_rq->nr_running != this_rq->cfs.h_nr_running &&
 -          ((this_rq->stop && this_rq->stop->on_rq) ||
 -           this_rq->dl.dl_nr_running ||
 -           (this_rq->rt.rt_nr_running && !rt_rq_throttled(&this_rq->rt))))
 +      if (this_rq->nr_running != this_rq->cfs.h_nr_running)
                pulled_task = -1;
  
        if (pulled_task) {

diff --cc mm/huge_memory.c
Simple merge