From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Nov 2019 18:11:01 +0000 (-0800)
Subject: Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.5-rc1~159
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=53a07a148fd05dc6d317745688270bc79fe73121;p=thirdparty%2Fkernel%2Flinux.git

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

Pull x86 PTI updates from Ingo Molnar:
 "Fix reporting bugs of the MDS and TAA mitigation status, if one or
  both are set via a boot option.

  No change to mitigation behavior intended"

* 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/speculation: Fix redundant MDS mitigation message
  x86/speculation: Fix incorrect MDS/TAA mitigation status
---

53a07a148fd05dc6d317745688270bc79fe73121