Merge branch 'x86/ras' into x86/core, to fix conflicts