diff options
| -rw-r--r-- | config-generic | 2 | ||||
| -rw-r--r-- | kernel.spec | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/config-generic b/config-generic index 1fac1b65d..0e9fc74b4 100644 --- a/config-generic +++ b/config-generic @@ -3751,7 +3751,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 1ef30527a..7a03e3313 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 2 +%global baserelease 3 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2231,6 +2231,9 @@ fi # ||----w | # || || %changelog +* Thu Dec 15 2011 Dave Jones <davej@redhat.com> - 3.2.0-0.rc5.git2.3 +- Change configfs to be built-in. (rhbz 767432) + * Wed Dec 14 2011 Steve Dickson <steved@redhat.com> 3.2.0-0.rc5.git2.2.fc17 - Enabled the in-kernel idmapper. - keyring: allow special keyrings to be cleared |