Merge branch 'sched/arch' into sched/urgent