Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Feb 2018 00:57:22 +0000 (16:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Feb 2018 00:57:22 +0000 (16:57 -0800)
Pull perf fix from Thomas Gleixner:
 "A single commit which shuts up a bogus GCC-8 warning"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/oprofile: Fix bogus GCC-8 warning in nmi_setup()


Trivial merge