]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 May 2017 16:06:43 +0000 (09:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 May 2017 16:06:43 +0000 (09:06 -0700)
commit3da41d8073341fd13efe9cbf36a052a15471985a
tree060ed78592245d7f3af72dfe93a36c186b0b6ffe
parent66183b3e5ca1f4f5dc4ae527b13a1be4d2f01688
parent87788733091984a972e8a2a08b39534a5635d350
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()