From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 27 May 2017 16:06:43 +0000 (-0700)
Subject: Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: Ubuntu-4.12.0-11.12~1034
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=de0b9d751b9cd4cfedd0112722e84d0b5abaac73;p=mirror_ubuntu-artful-kernel.git

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

Pull RAS fixes from Thomas Gleixner:
 "Two fixlets for RAS:

   - Export memory_error() so the NFIT module can utilize it

   - Handle memory errors in NFIT correctly"

* 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  acpi, nfit: Fix the memory error check in nfit_handle_mce()
  x86/MCE: Export memory_error()
---

de0b9d751b9cd4cfedd0112722e84d0b5abaac73