Merge branch 'linus' into sched/core, to resolve semantic conflict