diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-12 11:34:39 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-12 11:34:39 -0700 |
commit | 680352bda57e3dbf21cddf6a5e23aff7e294fb31 (patch) | |
tree | c047ee0678ab793e85f89bf95bd8eee574b066e2 /security/selinux/include | |
parent | 040b9d7ccff40e1fbd48029e3c769db188a3ba2c (diff) | |
parent | e2329b4252f373c244e75928be38bf1dd45b35da (diff) | |
download | linux-680352bda57e3dbf21cddf6a5e23aff7e294fb31.tar.gz linux-680352bda57e3dbf21cddf6a5e23aff7e294fb31.tar.bz2 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 'security/selinux/include')
0 files changed, 0 insertions, 0 deletions