Merge branch 'linus' into timers/2038