Merge branch 'linus' into cpus4096-for-linus