summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-09-30 17:28:22 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-09-30 17:28:22 +0200
commit618074282a0ae6daca7220e19130e9754c0a06fb (patch)
treebff44ab30ca9ee8c28544bcd76d95b5874124b2e /kernel.spec
parent95031afd022569250fd07fbbf2249f4bfac22b7f (diff)
parentb4635dd00ed5e74291298be1dd1d97d465394145 (diff)
downloadkernel-618074282a0ae6daca7220e19130e9754c0a06fb.tar.gz
kernel-618074282a0ae6daca7220e19130e9754c0a06fb.tar.xz
kernel-618074282a0ae6daca7220e19130e9754c0a06fb.zip
Merge remote-tracking branch 'origin/f35' into f35-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rwxr-xr-xkernel.spec3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index ba155eab8..b5800d9f7 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)