Merge branch 'tip/sched/urgent'

Sync with sched/urgent to avoid conflicts.

Signed-off-by: Peter Zijlstra <peterz@infradead.org>

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

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