diff options
| author | Linus Torvalds <[email protected]> | 2021-10-18 03:27:22 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2021-10-18 03:27:22 +0000 |
| commit | 89f6602d4b952470e068638a90bc16dd75b22ee7 (patch) | |
| tree | e00baf5c1f81175cf5ec45ea34158a9cbe2949b2 /drivers/fpga/fpga-bridge.c | |
| parent | Merge tag 'driver-core-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | x86/fpu: Mask out the invalid MXCSR bits properly (diff) | |
| download | kernel-89f6602d4b952470e068638a90bc16dd75b22ee7.tar.gz kernel-89f6602d4b952470e068638a90bc16dd75b22ee7.zip | |
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
Diffstat (limited to 'drivers/fpga/fpga-bridge.c')
0 files changed, 0 insertions, 0 deletions