From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 30 Nov 2019 22:49:08 +0000 (-0800)
Subject: Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.5-rc1~108
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8fa91bfa9ba4060347c45673f8ee990a2a1d760e;p=users%2Fjedix%2Flinux-maple.git

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

Pull RAS fix from Borislav Petkov:
 "One urgent fix for the thermal throttling machinery: the recent change
  reworking the thermal notifications forgot to mask out read-only and
  reserved bits in the thermal status MSRs, leading to exceptions while
  writing those MSRs.

  The fix takes care of masking out those bits first"

* 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce/therm_throt: Mask out read-only and reserved MSR bits
---

8fa91bfa9ba4060347c45673f8ee990a2a1d760e