summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-02-04 07:40:56 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2014-02-04 07:40:56 -0500
commitf6adf8acf2ae6b1f67319427911425c70b95c004 (patch)
tree5db40cf08b4b0df7d06301c551862d1dda5da02c /kernel.spec
parent5b159e4dd6ebe87db94ed4118899b94624deaa0a (diff)
downloadkernel-f6adf8acf2ae6b1f67319427911425c70b95c004.tar.gz
kernel-f6adf8acf2ae6b1f67319427911425c70b95c004.tar.xz
kernel-f6adf8acf2ae6b1f67319427911425c70b95c004.zip
Add NUMA oops patches
- 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 883eef529..5182ffc88 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -34,7 +34,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 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -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}
@@ -630,6 +630,9 @@ Patch25191: kernfs-oops-fix.patch
Patch25192: imx-hdmi-fix.patch
Patch25193: fix-exynos-hdmi-build.patch
+Patch25194: tang-numa-1.patch
+Patch25915: tang-numa-2.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1282,6 +1285,9 @@ ApplyPatch kernfs-oops-fix.patch
ApplyPatch imx-hdmi-fix.patch
ApplyPatch fix-exynos-hdmi-build.patch
+ApplyPatch tang-numa-1.patch
+ApplyPatch tang-numa-2.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2061,6 +2067,10 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Feb 04 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc1.git0.2
+- Add NUMA oops patches
+- Reenable debugging options.
+
* Mon Feb 03 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc1.git0.1
- Linux v3.14-rc1
- Disable debugging options.