summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-28 09:55:15 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-28 09:55:15 -0400
commitc6207348dfef098226d946a179061f0ba0fdcf7d (patch)
treeb2cfe3de49cf5853c6ad3d09c954053afde57294 /kernel.spec
parent995f274d713699f1bc0b4119054b47d2108928a1 (diff)
downloadkernel-c6207348dfef098226d946a179061f0ba0fdcf7d.tar.gz
kernel-c6207348dfef098226d946a179061f0ba0fdcf7d.tar.xz
kernel-c6207348dfef098226d946a179061f0ba0fdcf7d.zip
Linux v3.18-rc2-43-gf7e87a44ef60
- Add two RCU patches to fix a deadlock and a hang - Reenable debugging options.
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec15
1 files changed, 13 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index eceb18a2e..f5a45f24d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 2
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -124,7 +124,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}
@@ -620,6 +620,9 @@ Patch26058: asus-nb-wmi-Add-wapf4-quirk-for-the-X550VB.patch
#rhbz 1111138
Patch26059: i8042-Add-notimeout-quirk-for-Fujitsu-Lifebook-A544-.patch
+Patch26060: rcu-More-on-deadlock-between-CPU-hotplug-and-expedit.patch
+Patch26061: rcu-Make-rcu_barrier-understand-about-missing-rcuo-k.patch
+
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
Patch30000: kernel-arm64.patch
@@ -1349,6 +1352,9 @@ ApplyPatch asus-nb-wmi-Add-wapf4-quirk-for-the-X550VB.patch
#rhbz 1111138
ApplyPatch i8042-Add-notimeout-quirk-for-Fujitsu-Lifebook-A544-.patch
+ApplyPatch rcu-More-on-deadlock-between-CPU-hotplug-and-expedit.patch
+ApplyPatch rcu-Make-rcu_barrier-understand-about-missing-rcuo-k.patch
+
%if 0%{?aarch64patches}
ApplyPatch kernel-arm64.patch
%ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2217,6 +2223,11 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Oct 28 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc2.git1.1
+- Linux v3.18-rc2-43-gf7e87a44ef60
+- Add two RCU patches to fix a deadlock and a hang
+- Reenable debugging options.
+
* Mon Oct 27 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc2.git0.1
- Linux v3.18-rc2
- Disable debugging options.