summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-armv7-lpae1
-rw-r--r--config-generic1
-rw-r--r--kernel.spec5
-rw-r--r--sources2
4 files changed, 7 insertions, 2 deletions
diff --git a/config-armv7-lpae b/config-armv7-lpae
index c635efd4f..9f301c7e9 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -12,6 +12,7 @@ CONFIG_ARCH_EXYNOS5=y
# CONFIG_SOC_AM33XX is not set
# CONFIG_SND_AM33XX_SOC_EVM is not set
# CONFIG_SOC_AM43XX is not set
+# CONFIG_SOC_DRA7XX is not set
# CONFIG_ARCH_ROCKCHIP is not set
# CONFIG_ARCH_SOCFPGA is not set
# CONFIG_ARCH_TEGRA is not set
diff --git a/config-generic b/config-generic
index 9dce4f2fc..d15d3d427 100644
--- a/config-generic
+++ b/config-generic
@@ -3989,6 +3989,7 @@ CONFIG_CEPH_FS=m
CONFIG_CEPH_FSCACHE=y
CONFIG_BLK_DEV_RBD=m
CONFIG_CEPH_LIB=m
+CONFIG_CEPH_FS_POSIX_ACL=y
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_FSCACHE=m
diff --git a/kernel.spec b/kernel.spec
index dc5ed3dee..c683e4a60 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -61,7 +61,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 14
+%define gitrev 15
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2055,6 +2055,9 @@ fi
# ||----w |
# || ||
%changelog
+* Wed Jan 29 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc0.git15.1
+- Linux v3.13-9218-g0e47c96
+
* Tue Jan 28 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc0.git14.1
- Linux v3.13-8905-g627f4b3
diff --git a/sources b/sources
index 86c53e0b0..64d49c56b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
0ecbaf65c00374eb4a826c2f9f37606f linux-3.13.tar.xz
732d1952898b28d5ccc264cad77b0619 perf-man-3.13.tar.gz
-5f8566e20cf0f23332146719cb09a771 patch-3.13-git14.xz
+81a53ec05690416d6db7f87b83ee62dc patch-3.13-git15.xz