tree 14b51f8bf1d7e1bb35697cb4704255b51b15baa9
parent 72f40a2823d6e16229ab58b898c6f22044e5222f
parent ab234a260b1f625b26cbefa93ca365b0ae66df33
author Ingo Molnar <mingo@kernel.org> 1613133403 +0100
committer Ingo Molnar <mingo@kernel.org> 1613133403 +0100

Merge branch 'x86/paravirt' into x86/entry

Merge in the recent paravirt changes to resolve conflicts caused
by objtool annotations.

Conflicts:
	arch/x86/xen/xen-asm.S

Signed-off-by: Ingo Molnar <mingo@kernel.org>