Merge branch 'x86/paravirt' into x86/cpu