I'm moving to the @linux.dev account. Map my old addresses and update it to my new address. Signed-off-by: Muchun Song <songmuchun@xxxxxxxxxxxxx> --- .mailmap | 2 ++ MAINTAINERS | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 514a5a6c264d..ccba4cf0d893 100644 --- a/.mailmap +++ b/.mailmap @@ -374,6 +374,8 @@ Ricardo Ribalda <ribalda@xxxxxxxxxx> <ricardo.ribalda@xxxxxxxxx> Roman Gushchin <roman.gushchin@xxxxxxxxx> <guro@xxxxxx> Roman Gushchin <roman.gushchin@xxxxxxxxx> <guroan@xxxxxxxxx> Roman Gushchin <roman.gushchin@xxxxxxxxx> <klamm@xxxxxxxxxxxxxx> +Muchun Song <muchun.song@xxxxxxxxx> <songmuchun@xxxxxxxxxxxxx> +Muchun Song <muchun.song@xxxxxxxxx> <smuchun@xxxxxxxxx> Ross Zwisler <zwisler@xxxxxxxxxx> <ross.zwisler@xxxxxxxxxxxxxxx> Rudolf Marek <R.Marek@xxxxxxxxxx> Rui Saraiva <rmps@xxxxxxxxxxxxxxx> diff --git a/MAINTAINERS b/MAINTAINERS index 997e75dbca5c..b44cfa7f8ce9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5372,7 +5372,7 @@ M: Johannes Weiner <hannes@xxxxxxxxxxx> M: Michal Hocko <mhocko@xxxxxxxxxx> M: Roman Gushchin <roman.gushchin@xxxxxxxxx> M: Shakeel Butt <shakeelb@xxxxxxxxxx> -R: Muchun Song <songmuchun@xxxxxxxxxxxxx> +R: Muchun Song <muchun.song@xxxxxxxxx> L: cgroups@xxxxxxxxxxxxxxx L: linux-mm@xxxxxxxxx S: Maintained @@ -9552,7 +9552,7 @@ F: drivers/net/ethernet/huawei/hinic/ HUGETLB SUBSYSTEM M: Mike Kravetz <mike.kravetz@xxxxxxxxxx> -M: Muchun Song <songmuchun@xxxxxxxxxxxxx> +M: Muchun Song <muchun.song@xxxxxxxxx> L: linux-mm@xxxxxxxxx S: Maintained F: Documentation/ABI/testing/sysfs-kernel-mm-hugepages -- 2.11.0