]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge branch 'nvme-4.10-fixes' of git://git.infradead.org/nvme into for-linus
authorJens Axboe <axboe@fb.com>
Thu, 26 Jan 2017 16:56:15 +0000 (09:56 -0700)
committerJens Axboe <axboe@fb.com>
Thu, 26 Jan 2017 16:56:15 +0000 (09:56 -0700)
Pull nvme target fixes from Sagi:

Given that its -rc6, I removed anything that is not
bug fix.

- nvmet-fc discard fix from Christoph
- queue disconnect fix from James
- nvmet-rdma dma sync fix from Parav
- Some more nvmet fixes


Trivial merge