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)
commit649e441f49d4bfb717e9467950891dc452f4e063
tree2bdfdca65519db2f350c236cbbd65f24d5746cad
parent42f930da7f00c0ab23df4c7aed36137f35988980
parent5cb0512c02ecd7e6214e912e4c150f4219ac78e0
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>
kernel/futex.c
kernel/watchdog_hld.c