From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 Nov 2017 21:33:39 +0000 (-0800)
Subject: Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.19~2243
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2be8bd52e7410c70145f73511a2e80f4797e1a5;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull RAS updates from Ingo Molnar:
 "Two minor updates to AMD SMCA support, plus a timer_setup() conversion"

* 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/MCE/AMD: Fix mce_severity_amd_smca() signature
  x86/MCE/AMD: Always give panic severity for UC errors in kernel context
  x86/mce: Convert timers to use timer_setup()
---

f2be8bd52e7410c70145f73511a2e80f4797e1a5