Merge branch 'nvme-4.20' of git://git.infradead.org/nvme into for-linus
authorJens Axboe <axboe@kernel.dk>
Fri, 7 Dec 2018 15:40:13 +0000 (08:40 -0700)
committerJens Axboe <axboe@kernel.dk>
Fri, 7 Dec 2018 15:40:13 +0000 (08:40 -0700)
Pull NVMe fixes from Christoph.

* 'nvme-4.20' of git://git.infradead.org/nvme:
  nvmet-rdma: fix response use after free
  nvme: validate controller state before rescheduling keep alive


Trivial merge