Skip to content
Commit d832c005 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

Merge branch 'objtool/urgent' into objtool/core



 Conflicts:
	tools/objtool/elf.c
	tools/objtool/elf.h
	tools/objtool/orc_gen.c
	tools/objtool/check.c

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
parents 14bda4e5 0f1441b4
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment