summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2018-06-25 20:25:57 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2018-06-25 20:25:57 +0200
commitbad74c599039c04d737cb31b888f128adcd389f0 (patch)
treed6a7e6fe903bd1f435c164a125ed70162cae0b58 /kernel.spec
parent771ad6b3bd28d77f0b2fb8f22754c51c2f4935df (diff)
parenteeae7bec970c180f5664b7afd432a9c4796d642e (diff)
downloadkernel-bad74c599039c04d737cb31b888f128adcd389f0.tar.gz
kernel-bad74c599039c04d737cb31b888f128adcd389f0.tar.xz
kernel-bad74c599039c04d737cb31b888f128adcd389f0.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec17
1 files changed, 15 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index 6a7d71149..6e95c5b87 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -75,9 +75,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%global rcrev 1
+%global rcrev 2
# The git snapshot level
-%define gitrev 4
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -622,6 +622,9 @@ Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch
# rhbz 1470995
Patch504: kexec-bzimage-verify-pe-signature-fix.patch
+# i686 fix
+Patch505: 0001-kconfig-loop-boundary-condition-fix.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1860,6 +1863,16 @@ fi
#
#
%changelog
+* Mon Jun 25 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc2.git0.1
+- Linux v4.18-rc2
+
+* Mon Jun 25 2018 Laura Abbott <labbott@redhat.com>
+- Disable debugging options.
+
+* Mon Jun 25 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Disable BFP JIT on ARMv7 as it's currently broken
+- Remove forced console on aarch64, legacy config (rhbz 1594402)
+
* Fri Jun 22 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc1.git4.1
- Linux v4.18-rc1-189-g894b8c000ae6