diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-12-31 13:32:54 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-12-31 13:32:54 +0100 |
| commit | bcedc50d56cc59c8267a2495f5b9793dfb395f2a (patch) | |
| tree | 20fdfb1bb351a896f5013bded84ede1a3a94bcfa /kernel.spec | |
| parent | d964284245a6e732f02060c823e509f091d68475 (diff) | |
| parent | 153710e714a8574271764a6866ba1ecffe8b6103 (diff) | |
| download | kernel-bcedc50d56cc59c8267a2495f5b9793dfb395f2a.tar.gz kernel-bcedc50d56cc59c8267a2495f5b9793dfb395f2a.tar.xz kernel-bcedc50d56cc59c8267a2495f5b9793dfb395f2a.zip | |
Merge remote-tracking branch 'origin/f34' into f34-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index 6298c2ff7..2be750dc0 100755 --- a/kernel.spec +++ b/kernel.spec @@ -131,7 +131,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.15 -%define rpmversion 5.15.11 +%define rpmversion 5.15.12 %define patchversion 5.15 %define pkgrelease 100 @@ -685,7 +685,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.15.11.tar.xz +Source0: linux-5.15.12.tar.xz Source1: Makefile.rhelver @@ -1377,8 +1377,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.15.11 -c -mv linux-5.15.11 linux-%{KVERREL} +%setup -q -n kernel-5.15.12 -c +mv linux-5.15.12 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2977,6 +2977,9 @@ fi # # %changelog +* Wed Dec 29 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.15.12-0] +- iwlwifi: mvm: Increase the scan timeout guard to 30 seconds (Ilan Peer) + * Wed Dec 22 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.15.11-0] - Fix up Changelog (Justin M. Forbes) |