Merge branch 'linus' into idle-test