From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 17 Apr 2022 16:55:59 +0000 (-0700)
Subject: Merge tag 'x86-urgent-2022-04-17' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.1-rc5~1538
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3a69a44278a72e15f12e24f5db4d277a497649aa;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'x86-urgent-2022-04-17' of git://git./linux/kernel/git/tip/tip

Pull x86 fixes from Thomas Gleixner:
 "Two x86 fixes related to TSX:

   - Use either MSR_TSX_FORCE_ABORT or MSR_IA32_TSX_CTRL to disable TSX
     to cover all CPUs which allow to disable it.

   - Disable TSX development mode at boot so that a microcode update
     which provides TSX development mode does not suddenly make the
     system vulnerable to TSX Asynchronous Abort"

* tag 'x86-urgent-2022-04-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/tsx: Disable TSX development mode at boot
  x86/tsx: Use MSR_TSX_CTRL to clear CPUID bits
---

3a69a44278a72e15f12e24f5db4d277a497649aa