Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.1.0-65.vanilla.1.fc38kernel-6.1.0-65.vanilla.1.fc37kernel-6.1.0-65.vanilla.1.fc36kernel-6.1.0-65.vanilla.1.fc35

1 files changed, 17 insertions, 5 deletions

diff --git a/kernel.spec b/kernel.spec
index 89bbb971a..e220356b0 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -127,13 +127,13 @@ Summary: The Linux kernel
 # define buildid .local
 %define specversion 6.1.0
 %define patchversion 6.1
-%define pkgrelease 0.rc8.20221209git0d1409e4ff08.62
+%define pkgrelease 65
 %define kversion 6
-%define tarfile_release 6.1-rc8-148-g0d1409e4ff08
+%define tarfile_release 6.1
 # This is needed to do merge window version magic
 %define patchlevel 1
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc8.20221209git0d1409e4ff08.62%{?buildid}%{?dist}
+%define specrelease 65%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.1.0
 
@@ -2993,9 +2993,7 @@ fi
 %{_bindir}/centrino-decode
 %{_bindir}/powernow-k8-decode
 %endif
-%{_unitdir}/cpupower.service
 %{_mandir}/man[1-8]/cpupower*
-%config(noreplace) %{_sysconfdir}/sysconfig/cpupower
 %ifarch x86_64
 %{_bindir}/x86_energy_perf_policy
 %{_mandir}/man8/x86_energy_perf_policy*
@@ -3186,6 +3184,20 @@ fi
 #
 #
 %changelog
+* Mon Dec 12 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.1.0-65]
+- redhat/kernel.spec.template: Fix cpupower file error (Prarit Bhargava)
+- More Fedora configs for 6.1 as deps were switched on (Justin M. Forbes)
+
+* Mon Dec 12 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-65]
+- Linux v6.1.0
+
+* Sun Dec 11 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc8.4cee37b3a4e6.64]
+- Linux v6.1.0-0.rc8.4cee37b3a4e6
+
+* Sat Dec 10 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc8.3ecc37918c80.63]
+- Handle automated case when config generation works correctly (Don Zickus)
+- Linux v6.1.0-0.rc8.3ecc37918c80
+
 * Fri Dec 09 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc8.0d1409e4ff08.62]
 - Turn off CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64 (Justin M. Forbes)
 - Turn off CONFIG_EFI_ZBOOT as it makes CKI choke (Justin M. Forbes)