Ingo Molnar a3251c1a36 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>

2021-02-12 13:36:43 +01:00

..

asm

Merge branch 'x86/paravirt' into x86/entry

2021-02-12 13:36:43 +01:00

uapi/asm

Networking updates for 5.11

2020-12-15 13:22:29 -08:00