Merge branch 'objtool/urgent'

Fixup conflicts.

# Conflicts:
#	tools/objtool/check.c