sched: upstream changes