diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-08-18 21:30:32 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-08-18 21:30:32 +0200 |
commit | 10b29a7792dd284f9c4ecc8daefacce0e505064e (patch) | |
tree | 9147eec603afad786c1da78fca45ccff4aea6cf7 /kernel.spec | |
parent | 40934b366841a40dab7d45104a9230a39363cca7 (diff) | |
parent | 4acf22fb5b8d41bcd3e651fc2e81197a0cba7814 (diff) | |
download | kernel-10b29a7792dd284f9c4ecc8daefacce0e505064e.tar.gz kernel-10b29a7792dd284f9c4ecc8daefacce0e505064e.tar.xz kernel-10b29a7792dd284f9c4ecc8daefacce0e505064e.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.0.0-0.rc1.20220818git3b06a2755758.15.vanilla.1.fc38kernel-6.0.0-0.rc1.20220818git3b06a2755758.15.vanilla.1.fc37kernel-6.0.0-0.rc1.20220818git3b06a2755758.15.vanilla.1.fc36kernel-6.0.0-0.rc1.20220818git3b06a2755758.15.vanilla.1.fc35
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 9 |
1 files changed, 6 insertions, 3 deletions
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) |