summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-09-23 11:57:30 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-09-23 11:57:32 -0400
commit20c23beaf620e8b47f81f651ffbbd09f88701fae (patch)
treeba0a3cd3d6a9691e00a7466ab8a11a99b6aa1f12 /kernel.spec
parent9dcf78723c744f491a2a26226fc63b5b92fd07d2 (diff)
downloadkernel-20c23beaf620e8b47f81f651ffbbd09f88701fae.tar.gz
kernel-20c23beaf620e8b47f81f651ffbbd09f88701fae.tar.xz
kernel-20c23beaf620e8b47f81f651ffbbd09f88701fae.zip
Fix return code when adding keys (rhbz 1145318)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec7
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index a0e2dd5f1..ebec7132d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -621,6 +621,9 @@ Patch26022: x86-efi-Delete-misleading-efi_printk-error-message.patch
#rhbz 1123584
Patch26028: HID-rmi-check-sanity-of-incoming-report.patch
+#rhbz 1145318
+Patch26029: KEYS-Reinstate-EPERM-for-a-key-type-name-beginning-w.patch
+
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
Patch30000: kernel-arm64.patch
@@ -1353,6 +1356,9 @@ ApplyPatch x86-efi-Delete-misleading-efi_printk-error-message.patch
#rhbz 1123584
ApplyPatch HID-rmi-check-sanity-of-incoming-report.patch
+#rhbz 1145318
+ApplyPatch KEYS-Reinstate-EPERM-for-a-key-type-name-beginning-w.patch
+
%if 0%{?aarch64patches}
ApplyPatch kernel-arm64.patch
%ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2222,6 +2228,7 @@ fi
# || ||
%changelog
* Tue Sep 23 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix return code when adding keys (rhbz 1145318)
- Add patch to fix XPS 13 touchpad issue (rhbz 1123584)
* Tue Sep 23 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc6.git1.1