summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2022-08-18 21:30:32 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2022-08-18 21:30:32 +0200
commit10b29a7792dd284f9c4ecc8daefacce0e505064e (patch)
tree9147eec603afad786c1da78fca45ccff4aea6cf7
parent40934b366841a40dab7d45104a9230a39363cca7 (diff)
parent4acf22fb5b8d41bcd3e651fc2e81197a0cba7814 (diff)
downloadkernel-10b29a7792dd284f9c4ecc8daefacce0e505064e.tar.gz
kernel-10b29a7792dd284f9c4ecc8daefacce0e505064e.tar.xz
kernel-10b29a7792dd284f9c4ecc8daefacce0e505064e.zip
-rw-r--r--Makefile.rhelver2
-rw-r--r--kernel-aarch64-debug-fedora.config2
-rw-r--r--kernel-aarch64-fedora.config2
-rw-r--r--kernel-armv7hl-debug-fedora.config2
-rw-r--r--kernel-armv7hl-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-fedora.config2
-rwxr-xr-xkernel.spec9
-rw-r--r--sources6
9 files changed, 16 insertions, 13 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 5e65c2fc9..39d4dc1fe 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
-RHEL_RELEASE = 14
+RHEL_RELEASE = 15
#
# ZSTREAM
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index a67318358..84ec292f9 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -51,7 +51,7 @@ CONFIG_ACPI_BUTTON=y
# CONFIG_ACPI_CMPC is not set
CONFIG_ACPI_CONFIGFS=m
CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
+# CONFIG_ACPI_CPPC_CPUFREQ_FIE is not set
CONFIG_ACPI_CPPC_CPUFREQ=m
CONFIG_ACPI_CUSTOM_METHOD=m
CONFIG_ACPI_DEBUGGER_USER=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 1ed44ff8b..eec9fe717 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -51,7 +51,7 @@ CONFIG_ACPI_BUTTON=y
# CONFIG_ACPI_CMPC is not set
# CONFIG_ACPI_CONFIGFS is not set
CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
+# CONFIG_ACPI_CPPC_CPUFREQ_FIE is not set
CONFIG_ACPI_CPPC_CPUFREQ=m
# CONFIG_ACPI_CUSTOM_METHOD is not set
# CONFIG_ACPI_DEBUGGER is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 722904cb0..e6851e155 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -48,7 +48,7 @@ CONFIG_ACPI_BUTTON=y
# CONFIG_ACPI_CMPC is not set
CONFIG_ACPI_CONFIGFS=m
CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
+# CONFIG_ACPI_CPPC_CPUFREQ_FIE is not set
CONFIG_ACPI_CUSTOM_METHOD=m
CONFIG_ACPI_DEBUGGER_USER=m
CONFIG_ACPI_DEBUGGER=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 015bde80f..6abe51ab9 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -48,7 +48,7 @@ CONFIG_ACPI_BUTTON=y
# CONFIG_ACPI_CMPC is not set
# CONFIG_ACPI_CONFIGFS is not set
CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
+# CONFIG_ACPI_CPPC_CPUFREQ_FIE is not set
# CONFIG_ACPI_CUSTOM_METHOD is not set
# CONFIG_ACPI_DEBUGGER is not set
# CONFIG_ACPI_DEBUGGER_USER is not set
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 1c958fc1b..df1c16b94 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -48,7 +48,7 @@ CONFIG_ACPI_BUTTON=y
# CONFIG_ACPI_CMPC is not set
CONFIG_ACPI_CONFIGFS=m
CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
+# CONFIG_ACPI_CPPC_CPUFREQ_FIE is not set
CONFIG_ACPI_CUSTOM_METHOD=m
CONFIG_ACPI_DEBUGGER_USER=m
CONFIG_ACPI_DEBUGGER=y
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 20f94be19..8e550ef7c 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -48,7 +48,7 @@ CONFIG_ACPI_BUTTON=y
# CONFIG_ACPI_CMPC is not set
# CONFIG_ACPI_CONFIGFS is not set
CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
+# CONFIG_ACPI_CPPC_CPUFREQ_FIE is not set
# CONFIG_ACPI_CUSTOM_METHOD is not set
# CONFIG_ACPI_DEBUGGER is not set
# CONFIG_ACPI_DEBUGGER_USER is not set
diff --git a/kernel.spec b/kernel.spec
index df110c227..7f62db494 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -128,13 +128,13 @@ Summary: The Linux kernel
# define buildid .local
%define specversion 6.0.0
%define patchversion 6.0
-%define pkgrelease 0.rc1.20220817git3cc40a443a04.14
+%define pkgrelease 0.rc1.20220818git3b06a2755758.15
%define kversion 6
-%define tarfile_release 6.0-rc1-17-g3cc40a443a04
+%define tarfile_release 6.0-rc1-66-g3b06a2755758
# This is needed to do merge window version magic
%define patchlevel 0
# This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc1.20220817git3cc40a443a04.14%{?buildid}%{?dist}
+%define specrelease 0.rc1.20220818git3b06a2755758.15%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.0.0
@@ -3155,6 +3155,9 @@ fi
#
#
%changelog
+* Thu Aug 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc1.3b06a2755758.14]
+- redhat: configs: Disable FIE on arm (Jeremy Linton) [2012226]
+
* Wed Aug 17 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc1.3cc40a443a04.13]
- redhat/Makefile: Clean linux tarballs (Prarit Bhargava)
- redhat/configs: Cleanup CONFIG_ACPI_AGDI (Prarit Bhargava)
diff --git a/sources b/sources
index 1159ab22c..a73f68e61 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.0-rc1-17-g3cc40a443a04.tar.xz) = 4f29972032adb1f4dfee0598c4e2ec39e12aa63a36f44b61fb20ddeb3a9f598ca56a712f4aab1485f2c299f389ba7bdbc9d635b434aea29148fca8c2f2980573
-SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = fd9fec0c25aa97da4089e8b48ae156e6a204b0bafaa97897520ef87a3ffcbad043ebebda992b2e20e1eeb5fcea637889fc28735d23617cbf48cdb2c5c39ed1e2
-SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 37c387fbdcf9068b3a82596d1fe29ae7ca4c89b6e4b600159eed118379f5ff66e52aceab77292efc57f31d79f1f825afc46b896ae8835af41f895d3fda3af531
+SHA512 (linux-6.0-rc1-66-g3b06a2755758.tar.xz) = bdec676b4023cd62e8a349dd2cc123ba1e10950199794b4578095d8aca24b9b889ee803b0d09656bbae775946d011c014b9eb38569cae003649075c6a52d0cef
+SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = e11496f37111b3b1df42929ded0a01390db8d8d5a149ec70edb97c2a361083ed2d60bc2505aa4772ccd457cec51c1733220ba202718cdc8071c3dbaeb922ed00
+SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 593149b46c228257570e42c7898eab038ec447f020ec78383b397621579f2181b40cafba07690f60bf529568eab66092d81ab9180ef469983b5ac17736e173ab