diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-22 14:50:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-22 14:50:05 -0400 |
| commit | 7c034dfd58bbc056280262887acf5b7a98944d0a (patch) | |
| tree | 49dc3b77590f9929069db17922c823bb679c1456 /MAINTAINERS | |
| parent | 1204c464458e9837320a326a9fce550e3c5ef5de (diff) | |
| parent | c1c2fef6cfb04cf30a56bb37cff40d3498d7edbf (diff) | |
Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
Pull InfiniBand/RDMA updates from Roland Dreier:
- IPoIB fixes from Doug Ledford and Erez Shitrit
- iSER updates from Sagi Grimberg
- mlx4 GUID handling changes from Yishai Hadas
- other misc fixes
* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (51 commits)
mlx5: wrong page mask if CONFIG_ARCH_DMA_ADDR_T_64BIT enabled for 32Bit architectures
IB/iser: Rewrite bounce buffer code path
IB/iser: Bump version to 1.6
IB/iser: Remove code duplication for a single DMA entry
IB/iser: Pass struct iser_mem_reg to iser_fast_reg_mr and iser_reg_sig_mr
IB/iser: Modify struct iser_mem_reg members
IB/iser: Make fastreg pool cache friendly
IB/iser: Move PI context alloc/free to routines
IB/iser: Move fastreg descriptor pool get/put to helper functions
IB/iser: Merge build page-vec into register page-vec
IB/iser: Get rid of struct iser_rdma_regd
IB/iser: Remove redundant assignments in iser_reg_page_vec
IB/iser: Move memory reg/dereg routines to iser_memory.c
IB/iser: Don't pass ib_device to fall_to_bounce_buff routine
IB/iser: Remove a redundant struct iser_data_buf
IB/iser: Remove redundant cmd_data_len calculation
IB/iser: Fix wrong calculation of protection buffer length
IB/iser: Handle fastreg/local_inv completion errors
IB/iser: Fix unload during ep_poll wrong dereference
ib_srpt: convert printk's to pr_* functions
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ad5b42913527..ea0001760035 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -8803,6 +8803,15 @@ W: http://www.emulex.com | |||
| 8803 | S: Supported | 8803 | S: Supported |
| 8804 | F: drivers/net/ethernet/emulex/benet/ | 8804 | F: drivers/net/ethernet/emulex/benet/ |
| 8805 | 8805 | ||
| 8806 | EMULEX ONECONNECT ROCE DRIVER | ||
| 8807 | M: Selvin Xavier <selvin.xavier@emulex.com> | ||
| 8808 | M: Devesh Sharma <devesh.sharma@emulex.com> | ||
| 8809 | M: Mitesh Ahuja <mitesh.ahuja@emulex.com> | ||
| 8810 | L: linux-rdma@vger.kernel.org | ||
| 8811 | W: http://www.emulex.com | ||
| 8812 | S: Supported | ||
| 8813 | F: drivers/infiniband/hw/ocrdma/ | ||
| 8814 | |||
| 8806 | SFC NETWORK DRIVER | 8815 | SFC NETWORK DRIVER |
| 8807 | M: Solarflare linux maintainers <linux-net-drivers@solarflare.com> | 8816 | M: Solarflare linux maintainers <linux-net-drivers@solarflare.com> |
| 8808 | M: Shradha Shah <sshah@solarflare.com> | 8817 | M: Shradha Shah <sshah@solarflare.com> |