Pick up these commits from Linus's tree:
b106bcf0f9 ("locking/osq_lock: Clarify osq_wait_next()")
563adbfc35 ("locking/osq_lock: Clarify osq_wait_next() calling convention")
7c22309821 ("locking/osq_lock: Move the definition of optimistic_spin_node into osq_lock.c")
Signed-off-by: Ingo Molnar <mingo@kernel.org>