Merge branch 'linus' into core/urgent, to pick up dependent commits
authorIngo Molnar <mingo@kernel.org>
Sat, 4 Nov 2017 07:53:04 +0000 (08:53 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 4 Nov 2017 07:53:04 +0000 (08:53 +0100)
We want to fix an objtool build warning that got introduced in the latest upstream kernel.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/futex.c
kernel/watchdog_hld.c

diff --cc kernel/futex.c
Simple merge
Simple merge