Merge branch 'sched/for-linus' into tracing/for-linus