History

Merge tag 'block-6.5-2023-07-28' of git://git.kernel.dk/linux

Pull block fixes from Jens Axboe: "A few fixes that should go into the current kernel release, mainly: - Set of fixes for dasd (Stefan) - Handle interruptible waits returning because of a signal for ublk (Ming)" * tag 'block-6.5-2023-07-28' of git://git.kernel.dk/linux: ublk: return -EINTR if breaking from waiting for existed users in DEL_DEV ublk: fail to recover device if queue setup is interrupted ublk: fail to start device if queue setup is interrupted block: Fix a source code comment in include/uapi/linux/blkzoned.h s390/dasd: print copy pair message only for the correct error s390/dasd: fix hanging device after request requeue s390/dasd: use correct number of retries for ERP requests s390/dasd: fix hanging device after quiesce/resume

Linus Torvalds committed 3 years ago

Commit 818680d2 parents 9c65505 3e9dce85 files · +63 −88Browse files

Showing the changes to include/uapi/linux (1 of 5 files). Show all

Unified · Split

include/uapi/linux/blkzoned.h+5−5
@@ -51,13 +51,13 @@ enum blk_zone_type { · 50 unmodified lines
51 *51 *
52 * The Zone Condition state machine in the ZBC/ZAC standards maps the above52 * The Zone Condition state machine in the ZBC/ZAC standards maps the above
53 * deinitions as:53 * deinitions as:
54 * - ZC1: Empty | BLK_ZONE_EMPTY54 * - ZC1: Empty | BLK_ZONE_COND_EMPTY
55 * - ZC2: Implicit Open | BLK_ZONE_COND_IMP_OPEN55 * - ZC2: Implicit Open | BLK_ZONE_COND_IMP_OPEN
56 * - ZC3: Explicit Open | BLK_ZONE_COND_EXP_OPEN56 * - ZC3: Explicit Open | BLK_ZONE_COND_EXP_OPEN
57 * - ZC4: Closed | BLK_ZONE_CLOSED57 * - ZC4: Closed | BLK_ZONE_COND_CLOSED
58 * - ZC5: Full | BLK_ZONE_FULL58 * - ZC5: Full | BLK_ZONE_COND_FULL
59 * - ZC6: Read Only | BLK_ZONE_READONLY59 * - ZC6: Read Only | BLK_ZONE_COND_READONLY
60 * - ZC7: Offline | BLK_ZONE_OFFLINE60 * - ZC7: Offline | BLK_ZONE_COND_OFFLINE
61 *61 *
62 * Conditions 0x5 to 0xC are reserved by the current ZBC/ZAC spec and should62 * Conditions 0x5 to 0xC are reserved by the current ZBC/ZAC spec and should
63 * be considered invalid.63 * be considered invalid.