summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2015-02-24 18:25:10 +0000
committerRichard W.M. Jones <rjones@redhat.com>2015-02-24 18:25:10 +0000
commitf7bbaa5ad931357b0e53974dd4ebca385802366e (patch)
treeccbd277ef54057264cf59b9e985fb5d9608cfe77 /kernel.spec
parente587feee2deb333dfecd6af26cb38f0999fc5ad1 (diff)
downloadkernel-f7bbaa5ad931357b0e53974dd4ebca385802366e.tar.gz
kernel-f7bbaa5ad931357b0e53974dd4ebca385802366e.tar.xz
kernel-f7bbaa5ad931357b0e53974dd4ebca385802366e.zip
Add patch to fix aarch64 KVM bug with module loading (rhbz 1194366).
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 16ca947db..43146ce12 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,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 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -627,6 +627,9 @@ Patch26139: HID-i2c-hid-Limit-reads-to-wMaxInputLength-bytes-for.patch
Patch30000: kernel-arm64.patch
Patch30001: kernel-arm64-fix-psci-when-pg.patch
+# Not yet upstream, for https://bugzilla.redhat.com/show_bug.cgi?id=1194366#c12
+Patch30002: 0001-arm64-Fix-text-patching-logic-when-using-fixmap.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1359,6 +1362,8 @@ ApplyPatch kernel-arm64.patch -R
%endif
%endif
ApplyPatch kernel-arm64-fix-psci-when-pg.patch
+# Not yet upstream, for https://bugzilla.redhat.com/show_bug.cgi?id=1194366#c12
+ApplyPatch 0001-arm64-Fix-text-patching-logic-when-using-fixmap.patch
# END OF PATCH APPLICATIONS
@@ -2210,6 +2215,9 @@ fi
#
#
%changelog
+* Tue Feb 24 2015 Richard W.M. Jones <rjones@redhat.com> - 4.0.0-0.rc1.git0.2
+- Add patch to fix aarch64 KVM bug with module loading (rhbz 1194366).
+
* Tue Feb 24 2015 Peter Robinson <pbrobinson@fedoraproject.org>
- Minor ARM config update