summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-06-03 07:33:27 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2019-06-03 07:33:27 +0200
commit1d8c4dc9cf83d8c7a33fb723534f190cb24d9daa (patch)
treec76a046b6f1b2072b651d34e689ff46ced27d86b /kernel.spec
parentadf1da50b1c3a632a9ca9ccd6d7fa5eaeff6e0b5 (diff)
parentd06c52d683f2054ed3f47bc1cff20c5044161170 (diff)
downloadkernel-1d8c4dc9cf83d8c7a33fb723534f190cb24d9daa.tar.gz
kernel-1d8c4dc9cf83d8c7a33fb723534f190cb24d9daa.tar.xz
kernel-1d8c4dc9cf83d8c7a33fb723534f190cb24d9daa.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec7
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index 72dc57f10..7381939b3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -44,7 +44,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
@@ -596,7 +596,7 @@ Patch524: net-vhost_net-fix-possible-infinite-loop.patch
Patch526: s390-mark-__cpacf_check_opcode-and-cpacf_query_func-as-__always_inline.patch
Patch527: v2-powerpc-mm-mark-more-tlb-functions-as-__always_inline.patch
-Patch530: 0001-Revert-crypto-run-initcalls-for-generic-implementati.patch
+Patch530: crypto-ghash-fix-unaligned-memory-access-in-ghash_setkey.patch
# END OF PATCH DEFINITIONS
@@ -1839,6 +1839,9 @@ fi
#
#
%changelog
+* Fri May 31 2019 Peter Robinson <pbrobinson@fedoraproject.org> 5.2.0-0.rc2.git1.2
+- Bump for ARMv7 fix
+
* Thu May 30 2019 Justin M. Forbes <jforbes@redhat.com> - 5.2.0-0.rc2.git1.1
- Linux v5.2-rc2-24-gbec7550cca10
- Reenable debugging options.