diff options
| author | Linus Torvalds <[email protected]> | 2022-09-16 13:58:04 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2022-09-16 13:58:04 +0000 |
| commit | 68e777e44c275e8dbc36f5a187c366e982d6a129 (patch) | |
| tree | 0c6ab629d1ecc2924f95d7b81cbf7715db864ee3 /arch/arm/include/asm/assembler.h | |
| parent | Merge tag 'io_uring-6.0-2022-09-16' of git://git.kernel.dk/linux-block (diff) | |
| parent | blk-lib: fix blkdev_issue_secure_erase (diff) | |
| download | kernel-68e777e44c275e8dbc36f5a187c366e982d6a129.tar.gz kernel-68e777e44c275e8dbc36f5a187c366e982d6a129.zip | |
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
Diffstat (limited to 'arch/arm/include/asm/assembler.h')
0 files changed, 0 insertions, 0 deletions