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