diff options
| author | Jens Axboe | 2016-12-22 11:54:46 -0700 |
|---|---|---|
| committer | Jens Axboe | 2016-12-22 11:54:46 -0700 |
| commit | 8e5d31eb02c08d94262e1281adc8574134af65fd (patch) | |
| tree | e4e0dce124a26a5618fa5a8e722f5744d02d72d2 /MAINTAINERS | |
| parent | 72c5296f9d64d8f5f27c2133e5f108a45a353d71 (diff) | |
| parent | 7c3a23b85cac5f3caa531f369c1e3a5f1a8b555f (diff) | |
Merge branch 'nvme-4.10' of git://git.infradead.org/nvme into for-linus
Christoph writes:
The most significant one is that we've agreed on shared maintaince and
a common repository for the PCIe NVMe driver and NVMe over Fabrics. The
target code still only has a subset of the maintainers but goes through
the same tree as well. Keith, Sagi and me will take turns at collecting
patches and sending you pull requests.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c7b8cf1240d9..afb85976b1eb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8852,17 +8852,22 @@ F: drivers/video/fbdev/nvidia/ NVM EXPRESS DRIVER M: Keith Busch <keith.busch@intel.com> M: Jens Axboe <axboe@fb.com> +M: Christoph Hellwig <hch@lst.de> +M: Sagi Grimberg <sagi@grimberg.me> L: linux-nvme@lists.infradead.org -T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git -W: https://kernel.googlesource.com/pub/scm/linux/kernel/git/axboe/linux-block/ +T: git://git.infradead.org/nvme.git +W: http://git.infradead.org/nvme.git S: Supported F: drivers/nvme/host/ F: include/linux/nvme.h +F: include/uapi/linux/nvme_ioctl.h NVM EXPRESS TARGET DRIVER M: Christoph Hellwig <hch@lst.de> M: Sagi Grimberg <sagi@grimberg.me> L: linux-nvme@lists.infradead.org +T: git://git.infradead.org/nvme.git +W: http://git.infradead.org/nvme.git S: Supported F: drivers/nvme/target/ |