Merge branch 'x86/platform' into x86/headers, to apply dependent patches