Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Jul 2017 21:07:45 +0000 (14:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Jul 2017 21:07:45 +0000 (14:07 -0700)
commite6529f6f58a293fff59fa809ce67cfa063219d73
tree7157da693413b13c17d30ff5b6f39e418484f142
parent6553698be05983056f5561cef6aaee0cc6afe7a0
parentc133c7615751008f6c32ccae7cdfc5ff6e989c35
Merge branch 'x86-debug-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 debug update from Ingo Molnar:
 "A single fix for an off-by one bug in test_nmi_ipi() that probably
  doesn't matter in practice"

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/nmi: Fix timeout test in test_nmi_ipi()