Merge branch 'linus' into timers/core

To update with the latest fixes.