Merge branch 'linus' into core/urgent, to pick up dependent commits

We want to fix an objtool build warning that got introduced in the latest upstream kernel.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc kernel/futex.c
Simple merge

diff --cc kernel/watchdog_hld.c
Simple merge