As more email from git history gets aimed at the OpenWall kernel-hardening@ list, there has been a desire to separate "new topics" from "on-going" work. To handle this, the superset of hardening email topics are now to be directed to linux-hardening@xxxxxxxxxxxxxxx. Update the MAINTAINERS file and the .mailmap to accomplish this, so that linux-hardening@ can be treated like any other regular upstream kernel development list. Link: https://lore.kernel.org/linux-hardening/202010051443.279CC265D@keescook/ Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx> --- .mailmap | 1 + MAINTAINERS | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 50096b96c85d..91cea2d9a6a3 100644 --- a/.mailmap +++ b/.mailmap @@ -184,6 +184,7 @@ Leon Romanovsky <leon@xxxxxxxxxx> <leonro@xxxxxxxxxx> Linas Vepstas <linas@xxxxxxxxxxxxxx> Linus Lüssing <linus.luessing@xxxxxxxxx> <linus.luessing@xxxxxxxx> Linus Lüssing <linus.luessing@xxxxxxxxx> <linus.luessing@xxxxxx> +<linux-hardening@xxxxxxxxxxxxxxx> <kernel-hardening@xxxxxxxxxxxxxxxxxx> Li Yang <leoyang.li@xxxxxxx> <leoli@xxxxxxxxxxxxx> Li Yang <leoyang.li@xxxxxxx> <leo@xxxxxxxxxxxxx> Lukasz Luba <lukasz.luba@xxxxxxx> <l.luba@xxxxxxxxxxxxxxxxxxx> diff --git a/MAINTAINERS b/MAINTAINERS index adc4f0619b19..8fa1d8ce2188 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7216,7 +7216,7 @@ F: drivers/staging/gasket/ GCC PLUGINS M: Kees Cook <keescook@xxxxxxxxxxxx> R: Emese Revfy <re.emese@xxxxxxxxx> -L: kernel-hardening@xxxxxxxxxxxxxxxxxx +L: linux-hardening@xxxxxxxxxxxxxxx S: Maintained F: Documentation/kbuild/gcc-plugins.rst F: scripts/Makefile.gcc-plugins @@ -9776,7 +9776,7 @@ F: drivers/scsi/53c700* LEAKING_ADDRESSES M: Tobin C. Harding <me@xxxxxxxx> M: Tycho Andersen <tycho@tycho.pizza> -L: kernel-hardening@xxxxxxxxxxxxxxxxxx +L: linux-hardening@xxxxxxxxxxxxxxx S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git F: scripts/leaking_addresses.pl -- 2.25.1