Merge branch 'linus' into timers/core

Make sure the upstream fixes are applied before adding further
modifications.