From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 29 Jun 2019 08:58:35 +0000 (+0800)
Subject: Merge tag 'for-linus-20190628' of git://git.kernel.dk/linux-block
X-Git-Tag: v5.15~6110
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9dda12b6fa0eba6b1fd32399b599d05765893dae;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'for-linus-20190628' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
 "Just two small fixes.

  One from Paolo, fixing a silly mistake in BFQ. The other one is from
  me, ensuring that we have ->file cleared in the io_uring request a bit
  earlier. That avoids a use-before-free, if we encounter an error
  before ->file is assigned"

* tag 'for-linus-20190628' of git://git.kernel.dk/linux-block:
  block, bfq: fix operator in BFQQ_TOTALLY_SEEKY
  io_uring: ensure req->file is cleared on allocation
---

9dda12b6fa0eba6b1fd32399b599d05765893dae