Merge branch 'linus' into timers/2038

Merge upstream to pick up changes on which pending patches depend on.