Merge branch 'timers/urgent' into timers/core

Pick up upstream VDSO fix before adding more VDSO changes.