From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 23 Oct 2018 12:46:36 +0000 (+0100)
Subject: Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: for-linus-20181026~60
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0d1b82cd8ac2e8856ae9045c97782ac1c359929c;p=linux-2.6-block.git

Merge branch 'ras-core-for-linus' of git://git./linux/kernel/git/tip/tip

Pull RAS updates from Ingo Molnar:
 "Misc smaller fixes and cleanups"

* 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mcelog: Remove one mce_helper definition
  x86/mce: Add macros for the corrected error count bit field
  x86/mce: Use BIT_ULL(x) for bit mask definitions
  x86/mce-inject: Reset injection struct after injection
---

0d1b82cd8ac2e8856ae9045c97782ac1c359929c