Merge branch 'linus' into timers/core

Pick up upstream fixes for pending changes.