Merge branch 'nvme-4.17' of git://git.infradead.org/nvme into for-linus
authorJens Axboe <axboe@kernel.dk>
Tue, 29 May 2018 18:54:12 +0000 (12:54 -0600)
committerJens Axboe <axboe@kernel.dk>
Tue, 29 May 2018 18:54:12 +0000 (12:54 -0600)
commit43b4d1e122914c87e26bd83f6c0a1c50ddf31178
treef9a69cb11a0ae47fd8afa16e9e793bf9b54b45fd
parenteedffa28c9b00ca2dcb4d541b5a530f4c917052d
parentc97f414c54a255f4f05a50a2625efaeee406e134
Merge branch 'nvme-4.17' of git://git.infradead.org/nvme into for-linus

Pull NVMe fix from Christoph:

"Below is a one-liner fix from Max that unbreaks T10-DIF support, which
 got broken in 4.15."

* 'nvme-4.17' of git://git.infradead.org/nvme:
  nvme: fix extended data LBA supported setting