| commit | a3251c1a36f595046bea03935ebe37a1e1f1f1d7 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Fri Feb 12 13:36:43 2021 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Fri Feb 12 13:36:43 2021 +0100 |
| tree | 14b51f8bf1d7e1bb35697cb4704255b51b15baa9 | |
| parent | 72f40a2823d6e16229ab58b898c6f22044e5222f [diff] | |
| parent | ab234a260b1f625b26cbefa93ca365b0ae66df33 [diff] |
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>