summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-03-06 15:58:23 -0500
committerJosh Boyer <jwboyer@redhat.com>2013-03-06 16:00:17 -0500
commitbb07d251d0768dfb9dc837d2077e4dcdcb6f1a9d (patch)
tree4a2849220404b6d50f11a44cc6a778852456dcf8 /kernel.spec
parentd77d603f14fac20b0821a042a81d62a175af2a27 (diff)
downloadkernel-bb07d251d0768dfb9dc837d2077e4dcdcb6f1a9d.tar.gz
kernel-bb07d251d0768dfb9dc837d2077e4dcdcb6f1a9d.tar.xz
kernel-bb07d251d0768dfb9dc837d2077e4dcdcb6f1a9d.zip
Don't clear efi_info in boot_params (rhbz 918408)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec13
1 files changed, 11 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index fb826bd92..554845949 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,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 3
+%global baserelease 4
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -739,6 +739,9 @@ Patch21264: intel_pstate-Fix-intel_pstate_init-error-path.patch
#rhbz 917984
Patch21265: efi-fixes.patch
+#rhbz 918408
+Patch21266: x86-bootparams-dont-clear-efi_info.patch
+
Patch22000: weird-root-dentry-name-debug.patch
#selinux ptrace child permissions
@@ -1435,6 +1438,9 @@ ApplyPatch intel_pstate-Fix-intel_pstate_init-error-path.patch
#rhbz 917984
ApplyPatch efi-fixes.patch
+#rhbz 918408
+ApplyPatch x86-bootparams-dont-clear-efi_info.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2276,7 +2282,10 @@ fi
# ||----w |
# || ||
%changelog
-* Tue Mar 5 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+* Wed Mar 06 2013 Josh Boyer <jwboyer@redhat.com>
+- Don't clear efi_info in boot_params (rhbz 918408)
+
+* Wed Mar 06 2013 Peter Robinson <pbrobinson@fedoraproject.org>
- Update ARM mvebu config
* Wed Mar 06 2013 Dave Jones <davej@redhat.com>