diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-04 20:18:22 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-04 20:18:22 +0100 |
| commit | 04d740d5f5a3f37d69fef112b061340fcef6a26d (patch) | |
| tree | 1d2b8e1c40376b2451f38dac69a1665bfc9fe3db /MAINTAINERS | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| parent | staging/rdma: remove deprecated ipath driver (diff) | |
| download | linux-04d740d5f5a3f37d69fef112b061340fcef6a26d.tar.xz linux-04d740d5f5a3f37d69fef112b061340fcef6a26d.zip | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
Pull rdma fixes from Doug Ledford:
- One minor fix to the ib core
- Four minor fixes to the Mellanox drivers
- Remove three deprecated drivers from staging/rdma now that all of
Greg's queued changes to them are merged
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
staging/rdma: remove deprecated ipath driver
staging/rdma: remove deprecated ehca driver
staging/rdma: remove deprecated amso1100 driver
IB/core: Set correct payload length for RoCEv2 over IPv6
IB/mlx5: Use MLX5_GET to correctly get end of padding mode
IB/mlx5: Fix use of null pointer PD
IB/mlx5: Fix reqlen validation in mlx5_ib_alloc_ucontext
IB/mlx5: Add CREATE_CQ and CREATE_QP to uverbs_ex_cmd_mask
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 24c5b9a29670..5fa8d32b9b2e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -686,13 +686,6 @@ M: Michael Hanselmann <linux-kernel@hansmi.ch> S: Supported F: drivers/macintosh/ams/ -AMSO1100 RNIC DRIVER -M: Tom Tucker <tom@opengridcomputing.com> -M: Steve Wise <swise@opengridcomputing.com> -L: linux-rdma@vger.kernel.org -S: Maintained -F: drivers/infiniband/hw/amso1100/ - ANALOG DEVICES INC AD9389B DRIVER M: Hans Verkuil <hans.verkuil@cisco.com> L: linux-media@vger.kernel.org @@ -4198,13 +4191,6 @@ W: http://aeschi.ch.eu.org/efs/ S: Orphan F: fs/efs/ -EHCA (IBM GX bus InfiniBand adapter) DRIVER -M: Hoang-Nam Nguyen <hnguyen@de.ibm.com> -M: Christoph Raisch <raisch@de.ibm.com> -L: linux-rdma@vger.kernel.org -S: Supported -F: drivers/infiniband/hw/ehca/ - EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER M: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com> L: netdev@vger.kernel.org @@ -5823,12 +5809,6 @@ M: Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar> S: Maintained F: net/ipv4/netfilter/ipt_MASQUERADE.c -IPATH DRIVER -M: Mike Marciniszyn <infinipath@intel.com> -L: linux-rdma@vger.kernel.org -S: Maintained -F: drivers/staging/rdma/ipath/ - IPMI SUBSYSTEM M: Corey Minyard <minyard@acm.org> L: openipmi-developer@lists.sourceforge.net (moderated for non-subscribers) |