summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-09-09 15:04:27 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2013-09-09 15:04:27 -0400
commitef211b5b1781af89bcb982dfaa60c4583ce7ad28 (patch)
tree95d7c85283366b1fe9342b9bc016ffd58accf677
parenta6b4f86d348577ffc19b16d2f9a491e9b2c1a3bc (diff)
downloadkernel-ef211b5b1781af89bcb982dfaa60c4583ce7ad28.tar.gz
kernel-ef211b5b1781af89bcb982dfaa60c4583ce7ad28.tar.xz
kernel-ef211b5b1781af89bcb982dfaa60c4583ce7ad28.zip
Linux fscache-fixes-for-ceph-8429-g300893b
-rw-r--r--config-generic3
-rw-r--r--kernel.spec5
-rw-r--r--sources2
3 files changed, 8 insertions, 2 deletions
diff --git a/config-generic b/config-generic
index f4149c0d1..fd6a41248 100644
--- a/config-generic
+++ b/config-generic
@@ -61,6 +61,8 @@ CONFIG_PID_NS=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
CONFIG_NET_NS=y
+# CONFIG_USER_NS is not set
+# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set
CONFIG_POSIX_MQUEUE=y
# CONFIG_PREEMPT_NONE is not set
@@ -3774,6 +3776,7 @@ CONFIG_AUTOFS4_FS=y
CONFIG_NILFS2_FS=m
# CONFIG_LOGFS is not set
CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
CONFIG_BLK_DEV_RBD=m
CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
diff --git a/kernel.spec b/kernel.spec
index d363df49e..ee8fa6cd5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -95,7 +95,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 16
+%define gitrev 17
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2297,6 +2297,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Sep 09 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git17.1
+- Linux fscache-fixes-for-ceph-8429-g300893b
+
* Mon Sep 09 2013 Kyle McMartin <kyle@redhat.com>
- [arm] re-enable CONFIG_PCIEPORTBUS, now that tegra is fixed upstream.
diff --git a/sources b/sources
index db02a5386..c3f07f02b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
fea363551ff45fbe4cb88497b863b261 linux-3.11.tar.xz
-b45d241996ec1f50a7a65919822612e7 patch-3.11-git16.xz
+4bc90554111344275ed0e640f9ac47fc patch-3.11-git17.xz