tree 0d1a40e4bb1aae4946b9877c4a74bbd4bc73d50d
parent fa8d7cdc849e2ffa1748157277fc1d73315a4251
parent 0dc9c639e6553e39c13b2c0d54c8a1b098cb95e2
author Linus Torvalds <torvalds@linux-foundation.org> 1492977102 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1492977102 -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:
 "The MCE atomic notifier callchain invokes callbacks which might sleep.

  Convert it to a blocking notifier and prevent calls from atomic
  context"

* 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce: Make the MCE notifier a blocking one