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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: db2b0c5 fe255fe)

author	Peter Zijlstra <peterz@infradead.org>
	Wed, 6 Oct 2021 22:40:17 +0000 (00:40 +0200)
committer	Peter Zijlstra <peterz@infradead.org>
	Wed, 6 Oct 2021 22:40:17 +0000 (00:40 +0200)
commit	b08cadbd3b8721db738d9a00ef3ce3ed667e6d9c
tree	1b44ef760764ea19f82fd80088135d23ab565d2d	tree \| snapshot
parent	db2b0c5d7b6f19b3c2cab08c531b65342eb5252b	commit \| diff
parent	fe255fe6ad97685e5a4be0d871f43288dbc10ad6	commit \| diff

Merge branch 'objtool/urgent'

Fixup conflicts.

# Conflicts:
# tools/objtool/check.c

arch/x86/kvm/svm/svm.h	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/enlighten_pv.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/mmu_pv.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
tools/objtool/arch/x86/decode.c	diff1 \|	diff2 \|	blob \| history
tools/objtool/check.c	diff1 \|	diff2 \|	blob \| history
tools/objtool/include/objtool/elf.h	diff1 \|	diff2 \|	blob \| history
tools/objtool/orc_gen.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;