Merge tag 'block-5.7-2020-05-22' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 May 2020 18:10:42 +0000 (11:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 May 2020 18:10:42 +0000 (11:10 -0700)
commitdb9f384785b15e8569910c8e2ea1ffc83aedbff6
tree069751bd1ade93cdcb8ad0aaae2bbc1fa95212e2
parentb09ca17a2a082299c787025b6c3e614a24a24ca8
parent1592cd15eec6e2952453f9a82da6e8a53e2b8db5
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