Merge tag 'block-6.4-2023-06-23' of git://git.kernel.dk/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Jun 2023 23:04:35 +0000 (16:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Jun 2023 23:04:35 +0000 (16:04 -0700)
commit9cb38381bac9f629fd4e7eafef27066c23c3eaf9
tree865bf1f3b172139240e213d8fa4ce71c1d738026
parent917b3c7c0bcf82f62afc1d046352933bd68db931
parent9c39b7a905d84b7da5f59d80f2e455853fea7217
Merge tag 'block-6.4-2023-06-23' of git://git.kernel.dk/linux

Pull block fix from Jens Axboe:
 "It's apparently the week of 'fixup something from last week', because
  the same is true for this block pull request.

  Fix up a lock grab that needs to be IRQ saving, rather than just IRQ
  disabling, in the block cgroup code"

* tag 'block-6.4-2023-06-23' of git://git.kernel.dk/linux:
  block: make sure local irq is disabled when calling __blkcg_rstat_flush