Merge tag 'kvm-s390-next-6.8-1' of https://git.kernel.org/pub/scm/linux/kernel/git...

[thirdparty/kernel/stable.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d33cdf3d3ca64a6bf59c66049fa13790ef5e3d9c..9104430e148e6d4717f3c32c663914697dfe16cc 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9573,6 +9573,7 @@ F:        drivers/crypto/hisilicon/sgl.c
 F:     include/linux/hisi_acc_qm.h
 
 HISILICON ROCE DRIVER
+M:     Chengchang Tang <tangchengchang@huawei.com>
 M:     Junxian Huang <huangjunxian6@hisilicon.com>
 L:     linux-rdma@vger.kernel.org
 S:     Maintained
@@ -12188,6 +12189,8 @@ LINUX FOR POWERPC (32-BIT AND 64-BIT)
 M:     Michael Ellerman <mpe@ellerman.id.au>
 R:     Nicholas Piggin <npiggin@gmail.com>
 R:     Christophe Leroy <christophe.leroy@csgroup.eu>
+R:     Aneesh Kumar K.V <aneesh.kumar@kernel.org>
+R:     Naveen N. Rao <naveen.n.rao@linux.ibm.com>
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Supported
 W:     https://github.com/linuxppc/wiki/wiki
@@ -19563,7 +19566,6 @@ S:      Maintained
 F:     drivers/misc/sgi-xp/
 
 SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
-M:     Karsten Graul <kgraul@linux.ibm.com>
 M:     Wenjia Zhang <wenjia@linux.ibm.com>
 M:     Jan Karcher <jaka@linux.ibm.com>
 R:     D. Wythe <alibuda@linux.alibaba.com>