From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Jan 2020 01:28:52 +0000 (-0800)
Subject: Merge tag 'x86-pti-2020-01-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
X-Git-Tag: v5.10.7~3406
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b0be0eff1a5ab77d588b76bd8b1c92d5d17b3f73;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'x86-pti-2020-01-28' of git://git./linux/kernel/git/tip/tip

Pull x86 pti updates from Thomas Gleixner:
 "The performance deterioration departement provides a few non-scary
  fixes and improvements:

   - Update the cached HLE state when the TSX state is changed via the
     new control register. This ensures feature bit consistency.

   - Exclude the new Zhaoxin CPUs from Spectre V2 and SWAPGS
     vulnerabilities"

* tag 'x86-pti-2020-01-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/speculation/swapgs: Exclude Zhaoxin CPUs from SWAPGS vulnerability
  x86/speculation/spectre_v2: Exclude Zhaoxin CPUs from SPECTRE_V2
  x86/cpu: Update cached HLE state on write to TSX_CTRL_CPUID_CLEAR
---

b0be0eff1a5ab77d588b76bd8b1c92d5d17b3f73