From bfe354a1c3609cdd83fd0647153365ff4f81701f Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Mon, 29 Dec 2014 14:07:41 -0500 Subject: Enable F2FS (rhbz 972446) --- config-generic | 7 ++++++- kernel.spec | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/config-generic b/config-generic index 246b37dbf..74539dc30 100644 --- a/config-generic +++ b/config-generic @@ -4189,7 +4189,12 @@ CONFIG_FUSE_FS=m CONFIG_OVERLAY_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 2c2e63dc8..aaf648611 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 2 +%global baserelease 3 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2300,6 +2300,9 @@ fi # ||----w | # || || %changelog +* Sun Dec 28 2014 Josh Boyer +- Enable F2FS (rhbz 972446) + * Thu Dec 18 2014 Josh Boyer - 3.18.1-2 - CVE-2014-8989 userns can bypass group restrictions (rhbz 1170684 1170688) - Fix from Kyle McMartin for target_core_user uapi issue since it's enabled -- cgit