From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Sep 2022 13:58:04 +0000 (-0700)
Subject: Merge tag 'block-6.0-2022-09-16' of git://git.kernel.dk/linux-block
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=68e777e44c275e8dbc36f5a187c366e982d6a129;p=linux.git

Merge tag 'block-6.0-2022-09-16' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
 "Two fixes for -rc6:

   - Fix a mixup of sectors and bytes in the secure erase ioctl
     (Mikulas)

   - Fix for a bad return value for a non-blocking bio/blk queue enter
     call (me)"

* tag 'block-6.0-2022-09-16' of git://git.kernel.dk/linux-block:
  blk-lib: fix blkdev_issue_secure_erase
  block: blk_queue_enter() / __bio_queue_enter() must return -EAGAIN for nowait
---

68e777e44c275e8dbc36f5a187c366e982d6a129