diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-30 17:28:57 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-30 17:28:57 +0200 |
| commit | 77efb65e8b997175866511917469778a3f15fe3e (patch) | |
| tree | 8eb7a59e47f44bb58c8a896e93dc609cc858386b /kernel.spec | |
| parent | da42594f149ce0b04ae7b6eff18afd156a9c8fce (diff) | |
| parent | 4e7550243dcbd1eedffaef8189862a62c8f38f48 (diff) | |
| download | kernel-77efb65e8b997175866511917469778a3f15fe3e.tar.gz kernel-77efb65e8b997175866511917469778a3f15fe3e.tar.xz kernel-77efb65e8b997175866511917469778a3f15fe3e.zip | |
Merge remote-tracking branch 'origin/f33' into f33-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index 16c1ea92b..d90b8c7ec 100755 --- a/kernel.spec +++ b/kernel.spec @@ -2963,6 +2963,9 @@ fi # # %changelog +* Thu Sep 30 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.9-0] +- Revert "block, bfq: honor already-setup queue merges" (Jens Axboe) + * Mon Sep 27 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.8-0] - thermal/drivers/int340x: Do not set a wrong tcc offset on resume (Antoine Tenart) |