summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJeremy Cline <jcline@redhat.com>2019-11-04 11:12:42 -0500
committerJeremy Cline <jcline@redhat.com>2019-11-04 11:18:33 -0500
commit5fe065b6c0e7dce82e4a85fedf5513d2d9970a41 (patch)
treeed3642d59a508a7d5f13c7c7372f5bc6ef5902c3 /kernel.spec
parent32fe916e9be64984d89982b8cd9bb19c0c51f8aa (diff)
downloadkernel-5fe065b6c0e7dce82e4a85fedf5513d2d9970a41.tar.gz
kernel-5fe065b6c0e7dce82e4a85fedf5513d2d9970a41.tar.xz
kernel-5fe065b6c0e7dce82e4a85fedf5513d2d9970a41.zip
Linux v5.4-rc6
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec16
1 files changed, 6 insertions, 10 deletions
diff --git a/kernel.spec b/kernel.spec
index 397001d79..407167f8f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,7 +73,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 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -98,9 +98,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 5
+%global rcrev 6
# The git snapshot level
-%define gitrev 1
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 5.%{upstream_sublevel}.0
%endif
@@ -666,10 +666,6 @@ Patch204: efi-secureboot.patch
Patch205: lift-lockdown-sysrq.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1759325
-# Submitted upstream at https://lore.kernel.org/patchwork/patch/1136967/
-Patch206: efi-efi_test-lock-down-dev-efi_test-and-require-CAP_.patch
-
# 300 - ARM patches
Patch300: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
@@ -696,9 +692,6 @@ Patch324: arm64-tegra186-enable-USB-on-Jetson-TX2.patch
# https://patchwork.kernel.org/patch/11224177/
Patch325: arm64-usb-host-xhci-tegra-set-MODULE_FIRMWARE-for-tegra186.patch
-# https://www.spinics.net/lists/arm-kernel/msg761152.html
-Patch342: efi-libstub-arm-account-for-firmware-reserved-memory-at-the-base-of-RAM.patch
-
# 400 - IBM (ppc/s390x) patches
# 500 - Temp fixes/CVEs etc
@@ -2420,6 +2413,9 @@ fi
#
#
%changelog
+* Mon Nov 04 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc6.git0.1
+- Linux v5.4-rc6
+
* Mon Nov 04 2019 Jeremy Cline <jcline@redhat.com>
- Disable debugging options.