diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-02-01 13:18:47 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-02-01 13:18:47 +0100 |
commit | bee7bb315cd0b4529a4117b6220c29ca297fc023 (patch) | |
tree | fe4741f257e50782e51bc2955ad4480cd2ba6396 /gnu/packages/aux-files/linux-libre/4.14-x86_64.conf | |
parent | c2f0e5a44b537632c2655f97a2539c3bf02c8a63 (diff) | |
parent | 8a4644336d5063fd0bf43e90e3c0823c76e82e4e (diff) | |
download | guix-patches-bee7bb315cd0b4529a4117b6220c29ca297fc023.tar guix-patches-bee7bb315cd0b4529a4117b6220c29ca297fc023.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/aux-files/linux-libre/4.14-x86_64.conf')
-rw-r--r-- | gnu/packages/aux-files/linux-libre/4.14-x86_64.conf | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf index 6fe42fd505..bf071e01b7 100644 --- a/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.14-x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.0-gnu Kernel Configuration +# Linux/x86 4.14.15-gnu Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -351,6 +351,7 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y +CONFIG_ARCH_HAS_REFCOUNT=y CONFIG_REFCOUNT_FULL=y # @@ -458,6 +459,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y # CONFIG_GOLDFISH is not set +CONFIG_RETPOLINE=y # CONFIG_INTEL_RDT is not set CONFIG_X86_EXTENDED_PLATFORM=y CONFIG_X86_NUMACHIP=y @@ -1901,6 +1903,7 @@ CONFIG_DEV_COREDUMP=y CONFIG_SYS_HYPERVISOR=y # CONFIG_GENERIC_CPU_DEVICES is not set CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y CONFIG_REGMAP_SPI=y @@ -2140,8 +2143,8 @@ CONFIG_VIRTIO_BLK=y # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RSXX=m -CONFIG_NVME_CORE=m -CONFIG_BLK_DEV_NVME=m +CONFIG_NVME_CORE=y +CONFIG_BLK_DEV_NVME=y CONFIG_NVME_FABRICS=m CONFIG_NVME_RDMA=m CONFIG_NVME_FC=m @@ -8967,8 +8970,8 @@ CONFIG_OPTIMIZE_INLINING=y # CONFIG_DEBUG_NMI_SELFTEST is not set CONFIG_X86_DEBUG_FPU=y CONFIG_PUNIT_ATOM_DEBUG=m -CONFIG_UNWINDER_FRAME_POINTER=y # CONFIG_UNWINDER_ORC is not set +CONFIG_UNWINDER_FRAME_POINTER=y # CONFIG_UNWINDER_GUESS is not set # @@ -8986,6 +8989,7 @@ CONFIG_SECURITY=y CONFIG_SECURITY_WRITABLE_HOOKS=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y +CONFIG_PAGE_TABLE_ISOLATION=y # CONFIG_SECURITY_INFINIBAND is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y |