summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-09-10 09:55:35 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-09-10 09:55:35 -0400
commit3252fbd882e58c0b3e97d99da5191ddbd97cfab0 (patch)
treea3bda152983706c0f79282038673d07dd320170d /kernel.spec
parent4a609d305183e0a0f945b5574cee205fb20c5062 (diff)
downloadkernel-3252fbd882e58c0b3e97d99da5191ddbd97cfab0.tar.gz
kernel-3252fbd882e58c0b3e97d99da5191ddbd97cfab0.tar.xz
kernel-3252fbd882e58c0b3e97d99da5191ddbd97cfab0.zip
Linux v3.17-rc4-158-ge874a5fe3efa
- Add patch to fix oops on keyring gc (rhbz 1116347)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec12
1 files changed, 11 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index fcc08b97f..bcd403f05 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 4
# The git snapshot level
-%define gitrev 1
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -612,6 +612,9 @@ Patch26015: nfs-fix-kernel-warning-when-removing-proc-entry.patch
#rhbz 1134969
Patch26016: HID-wacom-Add-support-for-the-Cintiq-Companion.patch
+#rhbz 1116347
+Patch26017: KEYS-Fix-termination-condition-in-assoc-array-garbag.patch
+
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
Patch30000: kernel-arm64.patch
@@ -1335,6 +1338,9 @@ ApplyPatch nfs-fix-kernel-warning-when-removing-proc-entry.patch
#rhbz 1134969
ApplyPatch HID-wacom-Add-support-for-the-Cintiq-Companion.patch
+#rhbz 1116347
+ApplyPatch KEYS-Fix-termination-condition-in-assoc-array-garbag.patch
+
%if 0%{?aarch64patches}
ApplyPatch kernel-arm64.patch
%ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2203,6 +2209,10 @@ fi
# ||----w |
# || ||
%changelog
+* Wed Sep 10 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc4.git2.1
+- Linux v3.17-rc4-158-ge874a5fe3efa
+- Add patch to fix oops on keyring gc (rhbz 1116347)
+
* Tue Sep 09 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc4.git1.1
- Linux v3.17-rc4-140-g8c68face5548
- Reenable debugging options.