tree 2dfa18f657e3e84a34f74f36aa0489eac7c8cda9
parent a71c9a1c779f2499fb2afc0553e543f18aff6edf
parent cc66afea58f858ff6da7f79b8a595a67bbb4f9a9
author Linus Torvalds <torvalds@linux-foundation.org> 1491233784 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1491233784 -0700

Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull RAS fix from Thomas Gleixner:
 "Prevent dmesg from being spammed when MCE logging is active"

* 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce: Don't print MCEs when mcelog is active