From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Apr 2021 23:13:13 +0000 (-0700)
Subject: Merge tag 'block-5.12-2021-04-02' of git://git.kernel.dk/linux-block
X-Git-Tag: v5.15~1446
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d93a0d43e3d0ba9e19387be4dae4a8d5b175a8d7;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'block-5.12-2021-04-02' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:

 - Remove comment that never came to fruition in 22 years of development
   (Christoph)

 - Remove unused request flag (Christoph)

 - Fix for null_blk fake timeout handling (Damien)

 - Fix for IOCB_NOWAIT being ignored for O_DIRECT on raw bdevs (Pavel)

 - Error propagation fix for multiple split bios (Yufen)

* tag 'block-5.12-2021-04-02' of git://git.kernel.dk/linux-block:
  block: remove the unused RQF_ALLOCED flag
  block: update a few comments in uapi/linux/blkpg.h
  block: don't ignore REQ_NOWAIT for direct IO
  null_blk: fix command timeout completion handling
  block: only update parent bi_status when bio fail
---

d93a0d43e3d0ba9e19387be4dae4a8d5b175a8d7