Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 Nov 2018 22:18:10 +0000 (16:18 -0600)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 Nov 2018 22:18:10 +0000 (16:18 -0600)
commit1acf93ca6c53144f5ffd408f1820ef5431656eb7
tree0897c0f1266e864f113e040320e7585687e574f1
parent0b002cdd5004c0205364b3be2cfa6aed05c61f42
parentb987ffc18fb3b3b76b059aa9e372dbee26f7c4f2
Merge branch 'locking-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull locking build fix from Thomas Gleixner:
 "A single fix for a build fail with CONFIG_PROFILE_ALL_BRANCHES=y in
  the qspinlock code"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/qspinlock: Fix compile error