From e6e58e7774148b0d20bcdf7bab097e51ddb758d1 Mon Sep 17 00:00:00 2001
From: Jason Gunthorpe <jgg@mellanox.com>
Date: Thu, 16 Nov 2017 13:44:00 -0700
Subject: [PATCH] RDMA: Add Jason Gunthorpe as a co-maintainer

As was discussed in September and October, add Jason along with
Doug to have a team maintainership model for the RDMA subystem.

Mellanox Technologies will be funding Jason's independent work on
the maintainership.

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
---
 .mailmap    | 2 ++
 MAINTAINERS | 1 +
 2 files changed, 3 insertions(+)

diff --git a/.mailmap b/.mailmap
index c7b10caecc4e..cd1090fd2cc5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -71,6 +71,8 @@ James E Wilson <wilson@specifix.com>
 James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
 James Hogan <jhogan@kernel.org> <james@albanarts.com>
 James Ketrenos <jketreno@io.(none)>
+Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
+Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
 Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
 <javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
 Jean Tourrilhes <jt@hpl.hp.com>
diff --git a/MAINTAINERS b/MAINTAINERS
index f1688510178a..402f01e69b93 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6775,6 +6775,7 @@ F:	drivers/ipack/
 
 INFINIBAND SUBSYSTEM
 M:	Doug Ledford <dledford@redhat.com>
+M:	Jason Gunthorpe <jgg@mellanox.com>
 L:	linux-rdma@vger.kernel.org
 W:	http://www.openfabrics.org/
 Q:	http://patchwork.kernel.org/project/linux-rdma/list/