commit 89f6602d4b952470e068638a90bc16dd75b22ee7
author Linus Torvalds <torvalds@linux-foundation.org> Sun Oct 17 17:27:22 2021 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> Sun Oct 17 17:27:22 2021 -1000
tree e00baf5c1f81175cf5ec45ea34158a9cbe2949b2
parent cf52ad5ff16c38a62a6536b5e7612b56794f5a5e
parent b2381acd3fd9bacd2c63f53b2c610c89959b31cc

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