diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-12 20:34:39 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-12 20:34:39 +0200 |
commit | 680352bda57e3dbf21cddf6a5e23aff7e294fb31 (patch) | |
tree | c047ee0678ab793e85f89bf95bd8eee574b066e2 /crypto/fips.c | |
parent | Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
parent | x86/cpu: Remove unused and undefined __generic_processor_info() declaration (diff) | |
download | linux-680352bda57e3dbf21cddf6a5e23aff7e294fb31.tar.xz linux-680352bda57e3dbf21cddf6a5e23aff7e294fb31.zip |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Two fixes: dead code removal, plus a SME memory encryption fix on
32-bit kernels that crashed Xen guests"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/cpu: Remove unused and undefined __generic_processor_info() declaration
x86/mm: Make the SME mask a u64
Diffstat (limited to 'crypto/fips.c')
0 files changed, 0 insertions, 0 deletions