review.tizen.org Git - platform/kernel/linux-starfive.git/commit

projects / platform / kernel / linux-starfive.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 72f40a2 ab234a2)

author	Ingo Molnar <mingo@kernel.org>
	Fri, 12 Feb 2021 12:36:43 +0000 (13:36 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Fri, 12 Feb 2021 12:36:43 +0000 (13:36 +0100)
commit	a3251c1a36f595046bea03935ebe37a1e1f1f1d7
tree	14b51f8bf1d7e1bb35697cb4704255b51b15baa9	tree \| snapshot
parent	72f40a2823d6e16229ab58b898c6f22044e5222f	commit \| diff
parent	ab234a260b1f625b26cbefa93ca365b0ae66df33	commit \| 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>

arch/parisc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/sh/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/entry/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/idtentry.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/xen-asm.S	diff1 \|	diff2 \|	blob \| history
tools/objtool/check.c	diff1 \|	diff2 \|	blob \| history
tools/objtool/elf.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;