From: Linus Torvalds Date: Fri, 23 Jun 2023 23:04:35 +0000 (-0700) Subject: Merge tag 'block-6.4-2023-06-23' of git://git.kernel.dk/linux X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9cb38381bac9f629fd4e7eafef27066c23c3eaf9;p=linux.git 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 --- 9cb38381bac9f629fd4e7eafef27066c23c3eaf9