From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 May 2020 18:10:42 +0000 (-0700)
Subject: Merge tag 'block-5.7-2020-05-22' of git://git.kernel.dk/linux-block
X-Git-Tag: v5.7-rc7~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db9f384785b15e8569910c8e2ea1ffc83aedbff6;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'block-5.7-2020-05-22' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
 "Two fixes for null_blk zone mode"

* tag 'block-5.7-2020-05-22' of git://git.kernel.dk/linux-block:
  null_blk: don't allow discard for zoned mode
  null_blk: return error for invalid zone size
---

db9f384785b15e8569910c8e2ea1ffc83aedbff6