Merge branch 'x86/entry' into ras/core