summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Colomar <alx@kernel.org>2024-01-01 13:42:56 +0100
committerJonathan Corbet <corbet@lwn.net>2024-01-03 13:31:30 -0700
commite49ad8530de9f8eb71056faf59b49d4a336e53a1 (patch)
tree25a9c589108c5cd447e726db231b8cbec7772633
parent7418ec5b151f5591f750d57705cbb633c084a434 (diff)
downloadlinux-stable-e49ad8530de9f8eb71056faf59b49d4a336e53a1.tar.gz
linux-stable-e49ad8530de9f8eb71056faf59b49d4a336e53a1.tar.bz2
linux-stable-e49ad8530de9f8eb71056faf59b49d4a336e53a1.zip
CREDITS, MAINTAINERS, docs/process/howto: Update man-pages' maintainer
Michael retired from maintaining the Linux man-pages project in 2021. See commit 06e72cb19c74d3b1d661609c698ee26d7b6e4d7e ("CONTRIBUTING, README, lsm: Remove mtk as maintainer") in the Linux man-pages repository. Add him to CREDITS. Reported-by: Ahelenia ZiemiaƄska <nabijaczleweli@nabijaczleweli.xyz> Link: <https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/commit/?id=06e72cb19c74d3b1d661609c698ee26d7b6e4d7e> Acked-by: Randy Dunlap <rdunlap@infradead.org> Cc: Michael Kerrisk <mtk.manpages@gmail.com> Cc: Michael Kerrisk <mtk@man7.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Alejandro Colomar <alx@kernel.org> Signed-off-by: Jonathan Corbet <corbet@lwn.net> Link: https://lore.kernel.org/r/20240101124242.8059-2-alx@kernel.org
-rw-r--r--CREDITS7
-rw-r--r--Documentation/process/howto.rst3
-rw-r--r--MAINTAINERS2
3 files changed, 9 insertions, 3 deletions
diff --git a/CREDITS b/CREDITS
index f33a33fd2371..6781d4eeb9fb 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1828,6 +1828,13 @@ S: K osmidomkum 723
S: 160 00 Praha 6
S: Czech Republic
+N: Michael Kerrisk
+E: mtk.manpages@gmail.com
+W: https://man7.org/
+P: 4096R/3A35CE5E E522 595B 52ED A4E6 BFCC CB5E 8561 9911 3A35 CE5E
+D: Maintainer of the Linux man-pages project
+D: Linux man pages online, at <https://man7.org/linux/man-pages/>
+
N: Niels Kristian Bech Jensen
E: nkbj1970@hotmail.com
D: Miscellaneous kernel updates and fixes.
diff --git a/Documentation/process/howto.rst b/Documentation/process/howto.rst
index deb8235e20ff..6c73889c98fc 100644
--- a/Documentation/process/howto.rst
+++ b/Documentation/process/howto.rst
@@ -82,8 +82,7 @@ documentation files are also added which explain how to use the feature.
When a kernel change causes the interface that the kernel exposes to
userspace to change, it is recommended that you send the information or
a patch to the manual pages explaining the change to the manual pages
-maintainer at mtk.manpages@gmail.com, and CC the list
-linux-api@vger.kernel.org.
+maintainer at alx@kernel.org, and CC the list linux-api@vger.kernel.org.
Here is a list of files that are in the kernel source tree that are
required reading:
diff --git a/MAINTAINERS b/MAINTAINERS
index 0506d14340f7..9393c9b35f4d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12746,7 +12746,7 @@ F: drivers/mailbox/arm_mhuv2.c
F: include/linux/mailbox/arm_mhuv2_message.h
MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
-M: Michael Kerrisk <mtk.manpages@gmail.com>
+M: Alejandro Colomar <alx@kernel.org>
L: linux-man@vger.kernel.org
S: Maintained
W: http://www.kernel.org/doc/man-pages