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)
commit8b878ee247ef2691bd69e1bc3df5ae93738ea028
treec3a037f0dfbaedc5da564b9ab74d5a3d572948d0
parentc616cbee97aed4bc6178f148a7240206dcdb85a6
parentd7dcdf9d4e15189ecfda24cc87339a3425448d5c
Merge branch 'nvme-4.20' of git://git.infradead.org/nvme into for-linus

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