Merge tag 'ras_updates_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 21 Feb 2021 03:06:34 +0000 (19:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 21 Feb 2021 03:06:34 +0000 (19:06 -0800)
commit3e89c7ea7a828fec5694101e0f0ff7240e634470
tree8218f84745ee3cf5eabce6c76b8eb4cf5d82a017
parent8518496639123ebcceb1be173c4f00edf178bfbd
parent9223d0dccb8f8523754122f68316dd1a4f39f7f8
Merge tag 'ras_updates_for_v5.12' of git://git./linux/kernel/git/tip/tip

Pull RAS updates from Borislav Petkov:

 - move therm_throt.c to the thermal framework, where it belongs.

 - identify CPUs which miss to enter the broadcast handler, as an
   additional debugging aid.

* tag 'ras_updates_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  thermal: Move therm_throt there from x86/mce
  x86/mce: Get rid of mcheck_intel_therm_init()
  x86/mce: Make mce_timed_out() identify holdout CPUs
arch/x86/Kconfig
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/cpu/mce/core.c