From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 18 Oct 2021 03:27:22 +0000 (-1000)
Subject: Merge tag 'x86_urgent_for_v5.15_rc6' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: howlett/maple/20220722_2~2089
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=89f6602d4b952470e068638a90bc16dd75b22ee7;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'x86_urgent_for_v5.15_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Borislav Petkov:

 - Do not enable AMD memory encryption in Kconfig by default due to
   shortcomings of some platforms, leading to boot failures.

 - Mask out invalid bits in the MXCSR for 32-bit kernels again because
   Thomas and I don't know how to mask out bits properly. Third time's
   the charm.

* tag 'x86_urgent_for_v5.15_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/fpu: Mask out the invalid MXCSR bits properly
  x86/Kconfig: Do not enable AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT automatically
---

89f6602d4b952470e068638a90bc16dd75b22ee7