MAINTAINERS: update Muchun Song's email

I'm moving to the @linux.dev account.  Map my old addresses and update it
to my new address.

Link: https://lkml.kernel.org/r/20221208115548.85244-1-songmuchun@bytedance.com
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/.mailmap b/.mailmap
index 315e2207439a2c18a244341aa0c931012f142af4..f5bd014469d733fa34f862dbcca3a55797dc3752 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -373,6 +373,8 @@ Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
 Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
 Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
 Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>
+Muchun Song <muchun.song@linux.dev> <songmuchun@bytedance.com>
+Muchun Song <muchun.song@linux.dev> <smuchun@gmail.com>
 Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
 Rudolf Marek <R.Marek@sh.cvut.cz>
 Rui Saraiva <rmps@joel.ist.utl.pt>

diff --git a/MAINTAINERS b/MAINTAINERS
index 0e152a7afda82c2787b34c3e55cecad21ea2858e..93913c3825a8813cafcc8476fbff0c5217b5cf73 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5299,7 +5299,7 @@ M:        Johannes Weiner <hannes@cmpxchg.org>
 M:     Michal Hocko <mhocko@kernel.org>
 M:     Roman Gushchin <roman.gushchin@linux.dev>
 M:     Shakeel Butt <shakeelb@google.com>
-R:     Muchun Song <songmuchun@bytedance.com>
+R:     Muchun Song <muchun.song@linux.dev>
 L:     cgroups@vger.kernel.org
 L:     linux-mm@kvack.org
 S:     Maintained
@@ -9443,7 +9443,7 @@ F:        drivers/net/ethernet/huawei/hinic/
 
 HUGETLB SUBSYSTEM
 M:     Mike Kravetz <mike.kravetz@oracle.com>
-M:     Muchun Song <songmuchun@bytedance.com>
+M:     Muchun Song <muchun.song@linux.dev>
 L:     linux-mm@kvack.org
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-kernel-mm-hugepages