Merge branch 'linus' into x86/cpu, to pick up fixes