git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5f2643e 8978341)

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	2915ba4eb49646df4952b7a791816faf9793aea4
tree	1b44ef760764ea19f82fd80088135d23ab565d2d	tree \| snapshot
parent	5f2643e372a25beb8607c315aa84e6d3931e2634	commit \| diff
parent	89783413c57a4f5f007c410e6861ca85fdd91520	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

Linux Kernel Source Tree.