From: Ingo Molnar Date: Fri, 12 Feb 2021 12:36:43 +0000 (+0100) Subject: Merge branch 'x86/paravirt' into x86/entry X-Git-Tag: v5.12-rc1~39^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3251c1a36f595046bea03935ebe37a1e1f1f1d7;p=thirdparty%2Fkernel%2Flinux.git 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 --- a3251c1a36f595046bea03935ebe37a1e1f1f1d7