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