summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-05-15 14:16:36 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-05-15 14:16:36 -0400
commitf055781cf89f073e979c9198af6672ec12314972 (patch)
tree8e45cadf71a54b86a79e4289115ad6f9b063e69c /kernel.spec
parentf19b8f46b47bfe39e97004c5592930b8ac810a3b (diff)
downloadkernel-f055781cf89f073e979c9198af6672ec12314972.tar.gz
kernel-f055781cf89f073e979c9198af6672ec12314972.tar.xz
kernel-f055781cf89f073e979c9198af6672ec12314972.zip
Fix build fail on s390x
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec10
1 files changed, 9 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index 2b0de2858..11352bc59 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -40,7 +40,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 8
+%global baserelease 9
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -641,6 +641,9 @@ Patch25069: 0001-acpi-video-Add-4-new-models-to-the-use_native_backli.patch
#rhbz 1089545
Patch25070: 0001-acpi-video-Add-use_native_backlight-quirks-for-Think.patch
+Patch25071: s390-appldata-add-slab.h-for-kzalloc-kfree.patch
+
+
# END OF PATCH DEFINITIONS
%endif
@@ -1361,6 +1364,8 @@ ApplyPatch 0001-acpi-video-Add-4-new-models-to-the-use_native_backli.patch
#rhbz 1089545
ApplyPatch 0001-acpi-video-Add-use_native_backlight-quirks-for-Think.patch
+ApplyPatch s390-appldata-add-slab.h-for-kzalloc-kfree.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2231,6 +2236,9 @@ fi
# ||----w |
# || ||
%changelog
+* Thu May 15 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc5.git2.9
+- Fix build fail on s390x
+
* Wed May 14 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc5.git2.8
- Enable autoprov for kernel module Provides (rhbz 1058331)
- Enable xz compressed modules (from Kyle McMartin)