Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Jan 2018 20:24:42 +0000 (12:24 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Jan 2018 20:24:42 +0000 (12:24 -0800)
Pull locking fixes from Ingo Molnar:
 "Two futex fixes: a input parameters robustness fix, and futex race
  fixes"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  futex: Prevent overflow by strengthen input validation
  futex: Avoid violating the 10th rule of futex


Trivial merge