From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 19 Dec 2021 20:38:53 +0000 (-0800)
Subject: Merge tag 'block-5.16-2021-12-19' of git://git.kernel.dk/linux-block
X-Git-Tag: v6.1-rc5~2411
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2da09da4ae5e1714606668bdb145806b0afe9c90;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'block-5.16-2021-12-19' of git://git.kernel.dk/linux-block

Pull block revert from Jens Axboe:
 "It turns out that the fix for not hammering on the delayed work timer
  too much caused a performance regression for BFQ, so let's revert the
  change for now.

  I've got some ideas on how to fix it appropriately, but they should
  wait for 5.17"

* tag 'block-5.16-2021-12-19' of git://git.kernel.dk/linux-block:
  Revert "block: reduce kblockd_mod_delayed_work_on() CPU consumption"
---

2da09da4ae5e1714606668bdb145806b0afe9c90