Merge branches 'sched/debug' and 'linus' into sched/core