summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-09-30 17:28:54 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-09-30 17:28:54 +0200
commit0d92163e118ae1dc991925e555269c9e9515ca3b (patch)
treeb9acb11679f98b0ff40a3a03935d5850560dc93c /kernel.spec
parentfca52f25d5c41d4d003d5950edbaefc2a104294d (diff)
parent07180cdfb9e42ffb9975cdf6af900dce2d2d0d27 (diff)
downloadkernel-0d92163e118ae1dc991925e555269c9e9515ca3b.tar.gz
kernel-0d92163e118ae1dc991925e555269c9e9515ca3b.tar.xz
kernel-0d92163e118ae1dc991925e555269c9e9515ca3b.zip
Merge remote-tracking branch 'origin/f34' into f34-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 a8914d0af..61f1c2a38 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)