diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-07 16:29:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-07 16:29:21 -0700 |
| commit | e8193ce572f0ddb8004acf976bba119f0abbe6ca (patch) | |
| tree | 9bfabb44e3a00bf757f8e6859ff6277487ecefd1 /MAINTAINERS | |
| parent | 5125ed5b5438ab534df9bfc309dd556781c4ec9b (diff) | |
| parent | c9a2433a901250637e05539ef111b91dbc52edb8 (diff) | |
Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
Pull infiniband fixes from Roland Dreier:
- qib RCU/lockdep fix
- iser device removal fix, plus doc fixes
* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/qib: Fix lockdep splat in qib_alloc_lkey()
MAINTAINERS: Add entry for iSCSI Extensions for RDMA (iSER) initiator
IB/iser: Add Mellanox copyright
IB/iser: Fix device removal flow
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 73a5f63fb16..250dc970c62 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4448,6 +4448,16 @@ S: Maintained F: drivers/scsi/*iscsi* F: include/scsi/*iscsi* +ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR +M: Or Gerlitz <ogerlitz@mellanox.com> +M: Roi Dayan <roid@mellanox.com> +L: linux-rdma@vger.kernel.org +S: Supported +W: http://www.openfabrics.org +W: www.open-iscsi.org +Q: http://patchwork.kernel.org/project/linux-rdma/list/ +F: drivers/infiniband/ulp/iser + ISDN SUBSYSTEM M: Karsten Keil <isdn@linux-pingi.de> L: isdn4linux@listserv.isdn4linux.de (subscribers-only) |