diff options
| -rw-r--r-- | SOURCES/0001-amd-pstate.patch | 23 | ||||
| -rw-r--r-- | SOURCES/kernel-x86_64-debug-fedora.config | 1 | ||||
| -rw-r--r-- | SOURCES/kernel-x86_64-fedora.config | 1 | ||||
| -rw-r--r-- | SOURCES/kernel.changelog | 4 | ||||
| -rw-r--r-- | SOURCES/patch-6.9-redhat.patch | 2 | ||||
| -rw-r--r-- | SPECS/kernel.spec | 15 |
6 files changed, 21 insertions, 25 deletions
diff --git a/SOURCES/0001-amd-pstate.patch b/SOURCES/0001-amd-pstate.patch index 6e929f5..74fc021 100644 --- a/SOURCES/0001-amd-pstate.patch +++ b/SOURCES/0001-amd-pstate.patch @@ -1,16 +1,16 @@ -From 841eda55513de3b157eb94460e37e7b779980e0c Mon Sep 17 00:00:00 2001 +From f3018861226770c17b47bcda4d4fd4291ad00ae6 Mon Sep 17 00:00:00 2001 From: Peter Jung <admin@ptr1337.dev> -Date: Wed, 12 Jun 2024 18:19:17 +0200 -Subject: [PATCH 02/11] amd-pstate +Date: Sun, 16 Jun 2024 15:33:06 +0200 +Subject: [PATCH 02/10] amd-pstate Signed-off-by: Peter Jung <admin@ptr1337.dev> --- - drivers/cpufreq/amd-pstate.c | 267 +++++++++++++++++++++-------------- + drivers/cpufreq/amd-pstate.c | 265 +++++++++++++++++++++-------------- include/linux/amd-pstate.h | 20 ++- - 2 files changed, 178 insertions(+), 109 deletions(-) + 2 files changed, 177 insertions(+), 108 deletions(-) diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c -index 28166df81cf8d..cde3b91b4422a 100644 +index e263db0385ab..cde3b91b4422 100644 --- a/drivers/cpufreq/amd-pstate.c +++ b/drivers/cpufreq/amd-pstate.c @@ -68,6 +68,7 @@ static struct cpufreq_driver amd_pstate_epp_driver; @@ -142,15 +142,6 @@ index 28166df81cf8d..cde3b91b4422a 100644 static int amd_pstate_set_boost(struct cpufreq_policy *policy, int state) { struct amd_cpudata *cpudata = policy->driver_data; -@@ -705,7 +669,7 @@ static int amd_pstate_set_boost(struct cpufreq_policy *policy, int state) - if (state) - policy->cpuinfo.max_freq = cpudata->max_freq; - else -- policy->cpuinfo.max_freq = cpudata->nominal_freq; -+ policy->cpuinfo.max_freq = cpudata->nominal_freq * 1000; - - policy->max = policy->cpuinfo.max_freq; - @@ -844,9 +808,93 @@ static void amd_pstate_update_limits(unsigned int cpu) mutex_unlock(&amd_pstate_driver_lock); } @@ -388,7 +379,7 @@ index 28166df81cf8d..cde3b91b4422a 100644 case AMD_PSTATE_UNDEFINED: /* Disable on the following configs by default: diff --git a/include/linux/amd-pstate.h b/include/linux/amd-pstate.h -index d21838835abda..d58fc022ec466 100644 +index d21838835abd..d58fc022ec46 100644 --- a/include/linux/amd-pstate.h +++ b/include/linux/amd-pstate.h @@ -49,13 +49,17 @@ struct amd_aperf_mperf { diff --git a/SOURCES/kernel-x86_64-debug-fedora.config b/SOURCES/kernel-x86_64-debug-fedora.config index 7cfbfde..6448298 100644 --- a/SOURCES/kernel-x86_64-debug-fedora.config +++ b/SOURCES/kernel-x86_64-debug-fedora.config @@ -9004,7 +9004,6 @@ CONFIG_HID_APPLETB_BL=m CONFIG_HID_APPLETB_KBD=m CONFIG_HID_APPLE_MAGIC_BACKLIGHT=m CONFIG_APPLE_BCE=m -CONFIG_IO_URING=y CONFIG_LEGION_LAPTOP=m CONFIG_ACPI_CALL=m CONFIG_MFD_STEAMDECK=m diff --git a/SOURCES/kernel-x86_64-fedora.config b/SOURCES/kernel-x86_64-fedora.config index 9de38dd..c0749e7 100644 --- a/SOURCES/kernel-x86_64-fedora.config +++ b/SOURCES/kernel-x86_64-fedora.config @@ -8974,7 +8974,6 @@ CONFIG_HID_APPLETB_BL=m CONFIG_HID_APPLETB_KBD=m CONFIG_HID_APPLE_MAGIC_BACKLIGHT=m CONFIG_APPLE_BCE=m -CONFIG_IO_URING=y CONFIG_LEGION_LAPTOP=m CONFIG_ACPI_CALL=m CONFIG_MFD_STEAMDECK=m diff --git a/SOURCES/kernel.changelog b/SOURCES/kernel.changelog index 72aeced..0dcae9f 100644 --- a/SOURCES/kernel.changelog +++ b/SOURCES/kernel.changelog @@ -1,3 +1,7 @@ +* Sun Jun 16 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.9.5-0] +- Linux v6.9.5 +Resolves: + * Wed Jun 12 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.9.4-0] - Add libbpf workaround for F39 to patches (Justin M. Forbes) - Linux v6.9.4 diff --git a/SOURCES/patch-6.9-redhat.patch b/SOURCES/patch-6.9-redhat.patch index d0d5c3b..c496a2f 100644 --- a/SOURCES/patch-6.9-redhat.patch +++ b/SOURCES/patch-6.9-redhat.patch @@ -72,7 +72,7 @@ index 000000000000..733a26bd887a + +endmenu diff --git a/Makefile b/Makefile -index 91f1d4d34e80..9f03c9efab0d 100644 +index d5062a593ef7..d83327c33f55 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 59703c4..650b36b 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -160,18 +160,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 %define buildid .fsync -%define specrpmversion 6.9.4 -%define specversion 6.9.4 +%define specrpmversion 6.9.5 +%define specversion 6.9.5 %define patchversion 6.9 %define pkgrelease 200 %define kversion 6 -%define tarfile_release 6.9.4 +%define tarfile_release 6.9.5 # This is needed to do merge window version magic %define patchlevel 9 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 201%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.9.4 +%define kabiversion 6.9.5 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -4098,8 +4098,11 @@ fi\ # # %changelog -* Wed Jun 12 2024 Jan200101 <sentrycraft123@gmail.com> - 6.9.4-201.fsync -- kernel-fsync v6.9.4 +* Sat Jun 22 2024 Jan200101 <sentrycraft123@gmail.com> - 6.9.5-201.fsync +- kernel-fsync v6.9.5 + +* Sun Jun 16 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.9.5-0] +- Linux v6.9.5 * Wed Jun 12 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.9.4-0] - Add libbpf workaround for F39 to patches (Justin M. Forbes) |