aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorGravatar Vasily Gorbik <gor@linux.ibm.com> 2022-03-01 21:02:48 +0100
committerGravatar Vasily Gorbik <gor@linux.ibm.com> 2022-03-01 21:02:48 +0100
commit9a4f03ad6d67b63e7d2a3fe16c30511f5fb80040 (patch)
tree7766b8d6ce6edc309ddba6c9740a782bfe8d2192 /MAINTAINERS
parents390/mm: use CRST_ALLOC_ORDER instead of number (diff)
parents390/extable: fix exception table sorting (diff)
downloadlinux-9a4f03ad6d67b63e7d2a3fe16c30511f5fb80040.tar.gz
linux-9a4f03ad6d67b63e7d2a3fe16c30511f5fb80040.tar.bz2
linux-9a4f03ad6d67b63e7d2a3fe16c30511f5fb80040.zip
Merge branch 'fixes' into features
This helps to avoid several merge conflicts later. * fixes: s390/extable: fix exception table sorting s390/ftrace: fix arch_ftrace_get_regs implementation s390/ftrace: fix ftrace_caller/ftrace_regs_caller generation s390/setup: preserve memory at OLDMEM_BASE and OLDMEM_SIZE s390/cio: verify the driver availability for path_event call s390/module: fix building test_modules_helpers.o with clang MAINTAINERS: downgrade myself to Reviewer for s390 MAINTAINERS: add Alexander Gordeev as maintainer for s390 Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 5e4d1be85c22..f38461b877b1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16817,8 +16817,8 @@ F: drivers/video/fbdev/savage/
S390
M: Heiko Carstens <hca@linux.ibm.com>
M: Vasily Gorbik <gor@linux.ibm.com>
-M: Christian Borntraeger <borntraeger@linux.ibm.com>
-R: Alexander Gordeev <agordeev@linux.ibm.com>
+M: Alexander Gordeev <agordeev@linux.ibm.com>
+R: Christian Borntraeger <borntraeger@linux.ibm.com>
R: Sven Schnelle <svens@linux.ibm.com>
L: linux-s390@vger.kernel.org
S: Supported