summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-02-18 08:36:30 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2014-02-18 08:36:30 -0500
commit92e57c74328595b233c0be75b324fc5c0bb93ccf (patch)
treef1631ac1b096296e5f53126fdbeda28d47bbafcc /kernel.spec
parent8c6a41b9395b945f67aeb41d677a2de3cdc7261f (diff)
downloadkernel-92e57c74328595b233c0be75b324fc5c0bb93ccf.tar.gz
kernel-92e57c74328595b233c0be75b324fc5c0bb93ccf.tar.xz
kernel-92e57c74328595b233c0be75b324fc5c0bb93ccf.zip
Linux v3.14-rc3-20-g60f76ea
- Reenable debugging options.
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec14
1 files changed, 12 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index 80cdeb02a..a6f122987 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -61,7 +61,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 3
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -122,7 +122,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
# Want to build a vanilla kernel build without any non-upstream patches?
%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
@@ -625,6 +625,9 @@ Patch25195: cgroup-fixes.patch
Patch25200: cifs-ensure-that-uncached-writes-handle-unmapped-areas-correctly.patch
Patch25201: cifs-sanity-check-length-of-data-to-send-before-sending.patch
+#rhbz 1062833
+Patch25202: dma-debug-account-for-cachelines-and-read-only-mappings.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1272,6 +1275,9 @@ ApplyPatch cgroup-fixes.patch
ApplyPatch cifs-ensure-that-uncached-writes-handle-unmapped-areas-correctly.patch
ApplyPatch cifs-sanity-check-length-of-data-to-send-before-sending.patch
+#rhbz 1062833
+ApplyPatch dma-debug-account-for-cachelines-and-read-only-mappings.patch
+
# END OF PATCH APPLICATIONS
@@ -2052,6 +2058,10 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Feb 18 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc3.git1.1
+- Linux v3.14-rc3-20-g60f76ea
+- Reenable debugging options.
+
* Mon Feb 17 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc3.git0.1
- Linux v3.14-rc3
- Disable debugging options.