Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Nov 2019 22:49:08 +0000 (14:49 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Nov 2019 22:49:08 +0000 (14:49 -0800)
commit8fa91bfa9ba4060347c45673f8ee990a2a1d760e
tree977e9b41198f7ae3a06338926cacad3dd0b5b839
parent738d5fabff864a6b4a8b67f589a8f28f6cca808f
parent5a43b87b3c62ad149ba6e9d0d3e5c0e5da02a5ca
Merge branch 'ras-urgent-for-linus' of git://git./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