Merge commit 'upstream-x86-entry' into WIP.x86/mm