diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-12-09 21:20:41 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-12-09 21:20:41 +0100 |
| commit | a2e15a526815f6461205cd1023916bc26d5d35f8 (patch) | |
| tree | f90805efe17dba990c7837d30633e519cb2a9917 /kernel.spec | |
| parent | c1371ad6e24c3e88360bb75cddca04e34c8bb6d3 (diff) | |
| parent | 82d0dd957ed3c4a92e1714c4babe9110dc30bb30 (diff) | |
| download | kernel-a2e15a526815f6461205cd1023916bc26d5d35f8.tar.gz kernel-a2e15a526815f6461205cd1023916bc26d5d35f8.tar.xz kernel-a2e15a526815f6461205cd1023916bc26d5d35f8.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.1.0-0.rc8.20221209git0d1409e4ff08.62.vanilla.1.fc38kernel-6.1.0-0.rc8.20221209git0d1409e4ff08.62.vanilla.1.fc37kernel-6.1.0-0.rc8.20221209git0d1409e4ff08.62.vanilla.1.fc36kernel-6.1.0-0.rc8.20221209git0d1409e4ff08.62.vanilla.1.fc35
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/kernel.spec b/kernel.spec index 15766d0b7..89bbb971a 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.20221206gitbce9332220bd.59 +%define pkgrelease 0.rc8.20221209git0d1409e4ff08.62 %define kversion 6 -%define tarfile_release 6.1-rc8-3-gbce9332220bd +%define tarfile_release 6.1-rc8-148-g0d1409e4ff08 # 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.20221206gitbce9332220bd.59%{?buildid}%{?dist} +%define specrelease 0.rc8.20221209git0d1409e4ff08.62%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.1.0 @@ -844,8 +844,6 @@ Source300: kernel-abi-stablelists-%{kabiversion}.tar.bz2 Source301: kernel-kabi-dw-%{kabiversion}.tar.bz2 # Sources for kernel-tools -Source2000: cpupower.service -Source2001: cpupower.config Source2002: kvm_stat.logrotate # Some people enjoy building customized kernels from the dist-git in Fedora and @@ -2601,9 +2599,6 @@ mv cpupower.lang ../ popd %endif chmod 0755 %{buildroot}%{_libdir}/libcpupower.so* -mkdir -p %{buildroot}%{_unitdir} %{buildroot}%{_sysconfdir}/sysconfig -install -m644 %{SOURCE2000} %{buildroot}%{_unitdir}/cpupower.service -install -m644 %{SOURCE2001} %{buildroot}%{_sysconfdir}/sysconfig/cpupower %endif %ifarch x86_64 mkdir -p %{buildroot}%{_mandir}/man8 @@ -2749,15 +2744,6 @@ popd ### %if %{with_tools} -%post -n kernel-tools -%systemd_post cpupower.service - -%preun -n kernel-tools -%systemd_preun cpupower.service - -%postun -n kernel-tools -%systemd_postun cpupower.service - %post -n kernel-tools-libs /sbin/ldconfig @@ -3200,6 +3186,21 @@ fi # # %changelog +* 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) +- Linux v6.1.0-0.rc8.0d1409e4ff08 + +* Thu Dec 08 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc8.479174d402bc.61] +- Fedora config updates for 6.1 (Justin M. Forbes) +- redhat: Remove cpupower files (Prarit Bhargava) +- Linux v6.1.0-0.rc8.479174d402bc + +* Wed Dec 07 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc8.8ed710da2873.60] +- redhat/configs: update CXL-related options to match what RHEL will use (John W. Linville) +- Clean up the config for the Tegra186 timer (Al Stone) +- Linux v6.1.0-0.rc8.8ed710da2873 + * Tue Dec 06 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc8.bce9332220bd.59] - redhat/configs: move CONFIG_TEGRA186_GPC_DMA config (Mark Salter) - Check for kernel config git-push failures (Don Zickus) |