Merge branch 'x86/core' into core/ipi