Merge tag 'for-linus-20180530' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 May 2018 21:37:59 +0000 (16:37 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 May 2018 21:37:59 +0000 (16:37 -0500)
Pull block fix from Jens Axboe:
 "Just a single fix that should make it into this release, fixing a
  regression with T10-DIF on NVMe"

* tag 'for-linus-20180530' of git://git.kernel.dk/linux-block:
  nvme: fix extended data LBA supported setting


Trivial merge