diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-26 18:28:06 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-26 18:28:06 +0100 |
| commit | f49ffe4db17a6ea7b3bbb14205c3a16f934f7f3b (patch) | |
| tree | 1761b5d6e7fcac9e451a0c74a87846f08de4a67d /kernel.spec | |
| parent | 1b181cf6560defaf1e22033d2d0aa9810f9d9d5e (diff) | |
| parent | c8351b3d7a5401c09a2be72bdf84973c44634245 (diff) | |
| download | kernel-f49ffe4db17a6ea7b3bbb14205c3a16f934f7f3b.tar.gz kernel-f49ffe4db17a6ea7b3bbb14205c3a16f934f7f3b.tar.xz kernel-f49ffe4db17a6ea7b3bbb14205c3a16f934f7f3b.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-0.rc4.20210326gitdb24726bfefa.178.vanilla.1.fc35kernel-5.12.0-0.rc4.20210326gitdb24726bfefa.178.vanilla.1.fc34kernel-5.12.0-0.rc4.20210326gitdb24726bfefa.178.vanilla.1.fc33kernel-5.12.0-0.rc4.20210326gitdb24726bfefa.178.vanilla.1.fc32
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index b4746c54c..39a5df14c 100755 --- a/kernel.spec +++ b/kernel.spec @@ -70,7 +70,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc4.20210324git7acac4b3196c.176 +%global distro_build 0.rc4.20210326gitdb24726bfefa.178 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -113,13 +113,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.12.0 -%define pkgrelease 0.rc4.20210324git7acac4b3196c.176 +%define pkgrelease 0.rc4.20210326gitdb24726bfefa.178 # This is needed to do merge window version magic %define patchlevel 12 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20210324git7acac4b3196c.176%{?buildid}%{?dist} +%define specrelease 0.rc4.20210326gitdb24726bfefa.178%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -626,7 +626,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20210324git7acac4b3196c.tar.xz +Source0: linux-20210326gitdb24726bfefa.tar.xz Source1: Makefile.rhelver @@ -1281,8 +1281,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20210324git7acac4b3196c -c -mv linux-20210324git7acac4b3196c linux-%{KVERREL} +%setup -q -n kernel-20210326gitdb24726bfefa -c +mv linux-20210326gitdb24726bfefa linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2797,6 +2797,14 @@ fi # # %changelog +* Fri Mar 26 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc4.20210326gitdb24726bfefa.178] +- New configs in fs/pstore (CKI@GitLab) + +* Thu Mar 25 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc4.20210325gite138138003eb.177] +- New configs in arch/powerpc (Fedora Kernel Team) +- configs: enable BPF LSM on Fedora and ARK (Ondrej Mosnacek) +- configs: clean up LSM configs (Ondrej Mosnacek) + * Wed Mar 24 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc4.20210324git7acac4b3196c.176] - New configs in drivers/platform (CKI@GitLab) - New configs in drivers/firmware (CKI@GitLab) |