Merge branch 'linus' into timers/urgent

Get upstream changes so dependent patches can be applied.