aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mailmap2
-rw-r--r--MAINTAINERS2
2 files changed, 3 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 2a91c14c80bf..093a8ac9996e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -158,6 +158,8 @@ Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
158Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com> 158Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
159Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com> 159Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
160Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com> 160Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
161Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
162Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
161Takashi YOSHII <takashi.yoshii.zj@renesas.com> 163Takashi YOSHII <takashi.yoshii.zj@renesas.com>
162Yusuke Goda <goda.yusuke@renesas.com> 164Yusuke Goda <goda.yusuke@renesas.com>
163Gustavo Padovan <gustavo@las.ic.unicamp.br> 165Gustavo Padovan <gustavo@las.ic.unicamp.br>
diff --git a/MAINTAINERS b/MAINTAINERS
index 71aa5daeae8f..d44be8ad997b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3247,7 +3247,7 @@ F: kernel/cpuset.c
3247CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG) 3247CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
3248M: Johannes Weiner <hannes@cmpxchg.org> 3248M: Johannes Weiner <hannes@cmpxchg.org>
3249M: Michal Hocko <mhocko@kernel.org> 3249M: Michal Hocko <mhocko@kernel.org>
3250M: Vladimir Davydov <vdavydov@virtuozzo.com> 3250M: Vladimir Davydov <vdavydov.dev@gmail.com>
3251L: cgroups@vger.kernel.org 3251L: cgroups@vger.kernel.org
3252L: linux-mm@kvack.org 3252L: linux-mm@kvack.org
3253S: Maintained 3253S: Maintained