summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-12-29 14:07:41 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2014-12-29 15:53:31 -0500
commit94470083395d015165f45652f04ebe523db3a11a (patch)
tree8e6a794a042273c94f7b56ef758b32a78336dcdc
parent26223f69289108ab42024185ecfecf31fcebefc9 (diff)
downloadkernel-94470083395d015165f45652f04ebe523db3a11a.tar.gz
kernel-94470083395d015165f45652f04ebe523db3a11a.tar.xz
kernel-94470083395d015165f45652f04ebe523db3a11a.zip
Enable F2FS (rhbz 972446)
-rw-r--r--config-generic7
-rw-r--r--kernel.spec5
2 files changed, 10 insertions, 2 deletions
diff --git a/config-generic b/config-generic
index e3074230..27edd891 100644
--- a/config-generic
+++ b/config-generic
@@ -4150,7 +4150,12 @@ CONFIG_9P_FS_SECURITY=y
CONFIG_FUSE_FS=m
# CONFIG_OMFS_FS is not set
CONFIG_CUSE=m
-# CONFIG_F2FS_FS is not set
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+# CONFIG_F2FS_CHECK_FS is not set
#
# Network File Systems
diff --git a/kernel.spec b/kernel.spec
index 39c2d01f..f86733d0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,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 300
+%global baserelease 301
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -2329,6 +2329,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Dec 29 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Enable F2FS (rhbz 972446)
+
* Thu Dec 18 2014 Josh Boyer <jwboyer@fedoraproject.org>
- CVE-2014-8989 userns can bypass group restrictions (rhbz 1170684 1170688)
- Fix dm-cache crash (rhbz 1168434)