diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-26 10:39:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-26 10:39:36 -0700 |
| commit | 9420e8ade4353a6710908ffafa23ecaf1caa0123 (patch) | |
| tree | 0749456a22c9ce172770f6d14da0041db4f1e597 /MAINTAINERS | |
| parent | 1b649e0bcae71c118c1333e02249a7510ba7f70a (diff) | |
| parent | ba80013fba656b9830ef45cd40a6a1e44707f47a (diff) | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
Pull rdma fixes from Jason Gunthorpe:
"A small set of late-rc patches, mostly fixes for various crashers,
some syzkaller fixes and a mlx5 HW limitation:
- Several MAINTAINERS updates
- Memory leak regression in ODP
- Several fixes for syzkaller related crashes. Google recently taught
syzkaller to create the software RDMA devices
- Crash fixes for HFI1
- Several fixes for mlx5 crashes
- Prevent unprivileged access to an unsafe mlx5 HW resource"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
RDMA/mlx5: Block delay drop to unprivileged users
RDMA/mlx5: Fix access to wrong pointer while performing flush due to error
RDMA/core: Ensure security pkey modify is not lost
MAINTAINERS: Clean RXE section and add Zhu as RXE maintainer
IB/hfi1: Ensure pq is not left on waitlist
IB/rdmavt: Free kernel completion queue when done
RDMA/mad: Do not crash if the rdma device does not have a umad interface
RDMA/core: Fix missing error check on dev_set_name()
RDMA/nl: Do not permit empty devices names during RDMA_NLDEV_CMD_NEWLINK/SET
RDMA/mlx5: Fix the number of hwcounters of a dynamic counter
MAINTAINERS: Update maintainers for HISILICON ROCE DRIVER
RDMA/odp: Fix leaking the tgid for implicit ODP
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3b1d79bcae6a..b6ec33612118 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7579,7 +7579,8 @@ F: Documentation/admin-guide/perf/hisi-pmu.rst HISILICON ROCE DRIVER M: Lijun Ou <oulijun@huawei.com> -M: Wei Hu(Xavier) <xavier.huwei@huawei.com> +M: Wei Hu(Xavier) <huwei87@hisilicon.com> +M: Weihang Li <liweihang@huawei.com> L: linux-rdma@vger.kernel.org S: Maintained F: drivers/infiniband/hw/hns/ @@ -15421,11 +15422,9 @@ F: drivers/infiniband/sw/siw/ F: include/uapi/rdma/siw-abi.h SOFT-ROCE DRIVER (rxe) -M: Moni Shoua <monis@mellanox.com> +M: Zhu Yanjun <yanjunz@mellanox.com> L: linux-rdma@vger.kernel.org S: Supported -W: https://github.com/SoftRoCE/rxe-dev/wiki/rxe-dev:-Home -Q: http://patchwork.kernel.org/project/linux-rdma/list/ F: drivers/infiniband/sw/rxe/ F: include/uapi/rdma/rdma_user_rxe.h |