diff options
author | Francesco Colista <francesco.colista@gmail.com> | 2012-03-21 14:43:25 +0000 |
---|---|---|
committer | Francesco Colista <francesco.colista@gmail.com> | 2012-03-21 14:43:25 +0000 |
commit | 6f7a92508194657aefa5dbd1187e61c11674dad2 (patch) | |
tree | 46923ea037016e9dd28e38bf8177f5860aa042a7 /main/linux-grsec/kernelconfig.x86_64 | |
parent | 58e9c8a6a09015dd8098d3daff25e3b482a98810 (diff) | |
parent | 5d9620463b748f38927b1080a39093cdfb929254 (diff) | |
download | aports-6f7a92508194657aefa5dbd1187e61c11674dad2.tar.bz2 aports-6f7a92508194657aefa5dbd1187e61c11674dad2.tar.xz |
Merge git://dev.alpinelinux.org/aports
Diffstat (limited to 'main/linux-grsec/kernelconfig.x86_64')
-rw-r--r-- | main/linux-grsec/kernelconfig.x86_64 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64 index 164d8ce48..3fc1a9fc3 100644 --- a/main/linux-grsec/kernelconfig.x86_64 +++ b/main/linux-grsec/kernelconfig.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.2.11 Kernel Configuration +# Linux/x86_64 3.2.12 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -5214,6 +5214,7 @@ CONFIG_PAX_RANDMMAP=y # CONFIG_PAX_MEMORY_STACKLEAK is not set CONFIG_PAX_REFCOUNT=y # CONFIG_PAX_USERCOPY is not set +# CONFIG_PAX_SIZE_OVERFLOW is not set CONFIG_KEYS=y CONFIG_TRUSTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m |