From 6a7c0501a485fa37f3fa5d9ab232e37ff04e2155 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Wed, 14 Dec 2011 22:42:08 -0500 Subject: [PATCH] Change configfs to be built-in. (rhbz 767857) --- config-generic | 2 +- kernel.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/config-generic b/config-generic index 8ae85a234..b620c953e 100644 --- a/config-generic +++ b/config-generic @@ -3677,7 +3677,7 @@ CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y -CONFIG_CONFIGFS_FS=m +CONFIG_CONFIGFS_FS=y CONFIG_DLM=m CONFIG_DLM_DEBUG=y diff --git a/kernel.spec b/kernel.spec index ce9308edf..1ea18dba8 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 4 +%global baserelease 5 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2208,6 +2208,9 @@ fi # and build. %changelog +* Thu Dec 15 2011 Dave Jones - 3.1.5-5 +- Change configfs to be built-in. (rhbz 767857) + * Thu Dec 15 2011 Dave Jones - 3.1.5-4 - Disable Intel IOMMU by default.