Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9565077 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlx4-mlx5-MAINTAINERS-update' 

Tariq Toukan says:

====================
MAINTAINERS updates

This patchset contains updates to the MAINTAINERS file.
In the first patch, I replace Yishai as the maintainer of
the mlx4_core driver.

In the other two patches we move an RDMA header file from
the list of the mlx4/mlx5 core driver into the respective
IB driver, where it belongs.

Series generated against net commit:
468b0df6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f0d7ae95 17756758

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -8508,7 +8508,7 @@ S: Odd Fixes 
F:	drivers/media/radio/radio-miropcm20*



MELLANOX MLX4 core VPI driver

M:	Yishai Hadas <yishaih@mellanox.com>

M:	Tariq Toukan <tariqt@mellanox.com>

L:	netdev@vger.kernel.org

L:	linux-rdma@vger.kernel.org

W:	http://www.mellanox.com
@@ -8516,7 +8516,6 @@ Q: http://patchwork.ozlabs.org/project/netdev/list/ 
S:	Supported

F:	drivers/net/ethernet/mellanox/mlx4/

F:	include/linux/mlx4/

F:	include/uapi/rdma/mlx4-abi.h



MELLANOX MLX4 IB driver

M:	Yishai Hadas <yishaih@mellanox.com>
@@ -8526,6 +8525,7 @@ Q: http://patchwork.kernel.org/project/linux-rdma/list/ 
S:	Supported

F:	drivers/infiniband/hw/mlx4/

F:	include/linux/mlx4/

F:	include/uapi/rdma/mlx4-abi.h



MELLANOX MLX5 core VPI driver

M:	Saeed Mahameed <saeedm@mellanox.com>
@@ -8538,7 +8538,6 @@ Q: http://patchwork.ozlabs.org/project/netdev/list/ 
S:	Supported

F:	drivers/net/ethernet/mellanox/mlx5/core/

F:	include/linux/mlx5/

F:	include/uapi/rdma/mlx5-abi.h



MELLANOX MLX5 IB driver

M:	Matan Barak <matanb@mellanox.com>
@@ -8549,6 +8548,7 @@ Q: http://patchwork.kernel.org/project/linux-rdma/list/ 
S:	Supported

F:	drivers/infiniband/hw/mlx5/

F:	include/linux/mlx5/

F:	include/uapi/rdma/mlx5-abi.h



MELEXIS MLX90614 DRIVER

M:	Crt Mori <cmo@melexis.com>