[PATCH] CREDITS: Regularize email address for Kees Cook

[PATCH] CREDITS: Regularize email address for Kees Cook

[Kees Cook]

Update my email address to better reflect reality: company-specific things
(hw embargo) to Google, everything else to @kernel.org, drop less-used
aliases, but leave copyright-associated email comments as-is.

Signed-off-by: Kees Cook <kees@kernel.org>
---
I am happy to carry this via pstore or hardening, but figured I'd send
it via docs just to avoid any collisions with translation updates.
---
 Documentation/process/embargoed-hardware-issues.rst           | 2 +-
 .../translations/pt_BR/process/embargoed-hardware-issues.rst  | 4 ++--
 .../translations/sp_SP/process/embargoed-hardware-issues.rst  | 2 +-
 .../translations/zh_CN/process/embargoed-hardware-issues.rst  | 2 +-
 .../translations/zh_TW/process/embargoed-hardware-issues.rst  | 2 +-
 fs/pstore/blk.c                                               | 2 +-
 fs/pstore/zone.c                                              | 2 +-
 lib/test_firmware.c                                           | 2 +-
 lib/test_module.c                                             | 2 +-
 CREDITS                                                       | 3 +--
 10 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Documentation/process/embargoed-hardware-issues.rst b/Documentation/process/embargoed-hardware-issues.rst
index 2c244a6d1463..c588a7140293 100644
--- a/Documentation/process/embargoed-hardware-issues.rst
+++ b/Documentation/process/embargoed-hardware-issues.rst
@@ -306,7 +306,7 @@ an involved disclosed party. The current ambassadors list:
   Red Hat	Josh Poimboeuf <jpoimboe@redhat.com>
   SUSE		Jiri Kosina <jkosina@suse.cz>
 
-  Google	Kees Cook <keescook@chromium.org>
+  Google	Kees Cook <keescook@google.com>
 
   LLVM		Nick Desaulniers <ndesaulniers@google.com>
   ============= ========================================================
diff --git a/Documentation/translations/pt_BR/process/embargoed-hardware-issues.rst b/Documentation/translations/pt_BR/process/embargoed-hardware-issues.rst
index ae1fda0880cc..9a728c0291a3 100644
--- a/Documentation/translations/pt_BR/process/embargoed-hardware-issues.rst
+++ b/Documentation/translations/pt_BR/process/embargoed-hardware-issues.rst
@@ -310,7 +310,7 @@ A lista atual de embaixadores:
   Red Hat       Josh Poimboeuf <jpoimboe@redhat.com>
   SUSE          Jiri Kosina <jkosina@suse.cz>
 
-  Google        Kees Cook <keescook@chromium.org>
+  Google        Kees Cook <keescook@google.com>
 
   LLVM          Nick Desaulniers <ndesaulniers@google.com>
   ============= ========================================================
@@ -359,4 +359,4 @@ adiciona à lista. Após a inscrição, o assinante receberá e-mails da lista d
 e-mail que são assinados com a chave PGP da lista ou com o certificado S/MIME
 da lista. O cliente de e-mail do assinante pode extrair a chave PGP ou o
 certificado S/MIME da assinatura para que o assinante possa enviar e-mails
-criptografados para a lista.
\ No newline at end of file
+criptografados para a lista.
diff --git a/Documentation/translations/sp_SP/process/embargoed-hardware-issues.rst b/Documentation/translations/sp_SP/process/embargoed-hardware-issues.rst
index 7d4d694967c7..15084a29e51e 100644
--- a/Documentation/translations/sp_SP/process/embargoed-hardware-issues.rst
+++ b/Documentation/translations/sp_SP/process/embargoed-hardware-issues.rst
@@ -285,7 +285,7 @@ revelada involucrada. La lista de embajadores actuales:
   Red Hat	Josh Poimboeuf <jpoimboe@redhat.com>
   SUSE		Jiri Kosina <jkosina@suse.cz>
 
-  Google	Kees Cook <keescook@chromium.org>
+  Google	Kees Cook <keescook@google.com>
 
   LLVM		Nick Desaulniers <ndesaulniers@google.com>
   ============= ========================================================
diff --git a/Documentation/translations/zh_CN/process/embargoed-hardware-issues.rst b/Documentation/translations/zh_CN/process/embargoed-hardware-issues.rst
index c90ecb557811..c87d2ecda7d8 100644
--- a/Documentation/translations/zh_CN/process/embargoed-hardware-issues.rst
+++ b/Documentation/translations/zh_CN/process/embargoed-hardware-issues.rst
@@ -190,7 +190,7 @@ CVE分配
   SUSE		Jiri Kosina <jkosina@suse.cz>
 
   Amazon
-  Google	Kees Cook <keescook@chromium.org>
+  Google	Kees Cook <keescook@google.com>
   ============= ========================================================
 
 如果要将您的组织添加到专使名单中，请与硬件安全小组联系。被提名的专使必须完全
diff --git a/Documentation/translations/zh_TW/process/embargoed-hardware-issues.rst b/Documentation/translations/zh_TW/process/embargoed-hardware-issues.rst
index 611247c816f4..ab81081c7a17 100644
--- a/Documentation/translations/zh_TW/process/embargoed-hardware-issues.rst
+++ b/Documentation/translations/zh_TW/process/embargoed-hardware-issues.rst
@@ -226,7 +226,7 @@ CVE分配
   Red Hat	Josh Poimboeuf <jpoimboe@redhat.com>
   SUSE		Jiri Kosina <jkosina@suse.cz>
 
-  Google	Kees Cook <keescook@chromium.org>
+  Google	Kees Cook <keescook@google.com>
 
   LLVM		Nick Desaulniers <ndesaulniers@google.com>
   ============= ========================================================
diff --git a/fs/pstore/blk.c b/fs/pstore/blk.c
index 12070b6a7b11..3d7ab7eff821 100644
--- a/fs/pstore/blk.c
+++ b/fs/pstore/blk.c
@@ -357,5 +357,5 @@ module_exit(pstore_blk_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("WeiXiong Liao <liaoweixiong@allwinnertech.com>");
-MODULE_AUTHOR("Kees Cook <keescook@chromium.org>");
+MODULE_AUTHOR("Kees Cook <kees@kernel.org>");
 MODULE_DESCRIPTION("pstore backend for block devices");
diff --git a/fs/pstore/zone.c b/fs/pstore/zone.c
index a3b003f9a3a0..628c6cdaeae7 100644
--- a/fs/pstore/zone.c
+++ b/fs/pstore/zone.c
@@ -1471,5 +1471,5 @@ EXPORT_SYMBOL_GPL(unregister_pstore_zone);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("WeiXiong Liao <liaoweixiong@allwinnertech.com>");
-MODULE_AUTHOR("Kees Cook <keescook@chromium.org>");
+MODULE_AUTHOR("Kees Cook <kees@kernel.org>");
 MODULE_DESCRIPTION("Storage Manager for pstore/blk");
diff --git a/lib/test_firmware.c b/lib/test_firmware.c
index 7459bba65444..870fa0489a08 100644
--- a/lib/test_firmware.c
+++ b/lib/test_firmware.c
@@ -1567,6 +1567,6 @@ static void __exit test_firmware_exit(void)
 
 module_exit(test_firmware_exit);
 
-MODULE_AUTHOR("Kees Cook <keescook@chromium.org>");
+MODULE_AUTHOR("Kees Cook <kees@kernel.org>");
 MODULE_DESCRIPTION("interface to trigger and test firmware loading");
 MODULE_LICENSE("GPL");
diff --git a/lib/test_module.c b/lib/test_module.c
index 3d1b29b74807..a14b1e2d0e46 100644
--- a/lib/test_module.c
+++ b/lib/test_module.c
@@ -30,6 +30,6 @@ static void __exit test_module_exit(void)
 
 module_exit(test_module_exit);
 
-MODULE_AUTHOR("Kees Cook <keescook@chromium.org>");
+MODULE_AUTHOR("Kees Cook <kees@kernel.org>");
 MODULE_DESCRIPTION("module loading subsystem test module");
 MODULE_LICENSE("GPL");
diff --git a/CREDITS b/CREDITS
index c6c7b173b064..7242d7c92bf5 100644
--- a/CREDITS
+++ b/CREDITS
@@ -787,9 +787,8 @@ D: Assorted sched/mm titbits
 S: Oxfordshire, UK.
 
 N: Kees Cook
+E: kees@kernel.org
 E: kees@outflux.net
-E: kees@ubuntu.com
-E: keescook@chromium.org
 W: http://outflux.net/blog/
 P: 4096R/DC6DC026 A5C3 F68F 229D D60F 723E  6E13 8972 F4DF DC6D C026
 D: Various security things, bug fixes, and documentation.
-- 
2.55.0